diff --git a/.project b/.project
index 7fca757..3534a1a 100644
--- a/.project
+++ b/.project
@@ -1,3 +1,16 @@
+<<<<<<< HEAD
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>PR1_Git_Uebung</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
+=======
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>PR1_Git_Uebung</name>
@@ -9,3 +22,4 @@
 	<natures>
 	</natures>
 </projectDescription>
+>>>>>>> branch 'main' of https://gitty.informatik.hs-mannheim.de/2012537/PR1_Git_Uebung.git
diff --git a/2211778.txt b/2211778.txt
new file mode 100644
index 0000000..9b12055
--- /dev/null
+++ b/2211778.txt
@@ -0,0 +1 @@
+2211778
\ No newline at end of file
diff --git a/3003700.txt b/3003700.txt
new file mode 100644
index 0000000..7af224e
--- /dev/null
+++ b/3003700.txt
@@ -0,0 +1 @@
+Jeremy Karten
\ No newline at end of file
diff --git a/3003836.txt b/3003836.txt
new file mode 100644
index 0000000..6c14cdf
--- /dev/null
+++ b/3003836.txt
@@ -0,0 +1 @@
+din 
\ No newline at end of file