--- a
+++ b/.gitignore
@@ -0,0 +1,31 @@
+
+############################################################
+# DO NOT EDIT THIS FILE - the content may be overwritten
+# Version: 1.0.0.0
+############################################################
+
+
+# Ignore everything
+/*
+
+# Do not ignore .gitignore files
+!.gitignore
+!*/.gitignore
+
+# Do not ignore .gitattributes files
+!.gitattributes
+!*/.gitattributes
+
+# Do not ignore .gitkeep files
+!.gitkeep
+!*/.gitkeep
+
+# Do not ignore the directory /project
+!project/
+
+# Ignore *.ours and *.theirs files in 
+project/**/*.ours
+project/**/*.theirs
+
+# Ignore .apsession
+.apsession