Merge branch 'new_feature' into master

Readme.txt

@@ -1 +1,2 @@
-Zmiana tresci readme.txt
+Zmiana tresci readme.txt
+Modyfikacja readme.txt z poziomu brancha new_feature

src/main/java/com/mycompany/mavenproject1/Mavenproject1.java

@@ -9,7 +9,7 @@ package com.mycompany.mavenproject1;
  * @author student
  */
 public class Mavenproject1 {
-
+// hey x
     public static void main(String[] args) {
         System.out.println("Hello World!");
         System.out.println("Hello World2!");