diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..fdbd29ff
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj -crlf -diff -merge
diff --git a/.gitignore b/.gitignore
index 378eac25..3e0201e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 build
+*.pbxuser
+*.mode1v3
+.DS_Store