diff --git a/.gitignore b/.gitignore
index 496ee2c..57ff146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
-.DS_Store
\ No newline at end of file
+.DS_Store
+.dropbox
+<<<<<<< HEAD
+Icon
+=======
+Icon
+>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389