diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a1c2a23..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
diff --git a/HelloWorld/src/programm.java b/HelloWorld/src/programm.java
new file mode 100644
index 0000000..8fb461d
--- /dev/null
+++ b/HelloWorld/src/programm.java
@@ -0,0 +1,20 @@
+public class Program {
+
+	public static void main(String[] args) {
+		
+		for (int i=1; i<=10; i++) {
+        // Branche featureA
+        System.out.println("Hallo World ...");
+        // Branche featureA next commit
+		System.out.println("Hallo World ..."+i);
+<<<<<<< HEAD
+        // change for 4. commit	
+		System.out.println("Hallo 4. World ..."+i);
+
+=======
+        // New comment 
+        System.out.println("Hallo FeatureA ..."+i);
+>>>>>>> featureA
+		}
+		
+	}
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index adbb166..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# JavaProject
-this is java rep.