diff --git a/README.txt b/README.txt
index e69de29..1e3feca 100644
--- a/README.txt
+++ b/README.txt
@@ -0,0 +1,7 @@
+<<<<<<< HEAD
+=======
+A simple Pac-Man clone.
+So far.
+About to add Path finding for the Ghosts and an A.I. that controls Pac-Man.
+blob
+>>>>>>> 580458bbfd7baf561a1e7de924bcf0e3d50c4b48
diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..66d1c8e
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,7 @@
+/Brick.class
+/Game.class
+/Ghost.class
+/Main.class
+/Map.class
+/Picture.class
+/Player.class