diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..06d0c52ff5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,21 @@
+# Xcode
+build/*
+*.pbxuser
+!default.pbxuser
+*.mode?v3
+!default.mode?v3
+*.perspective
+*.perspectivev3
+!default.perspectivev3
+*.xcworkspace
+!default.xcworkspace
+xcuserdata
+profile
+*.moved-aside
+
+# osx noise
+.DS_Store
+*.ipa
+*.swp
+*~.nib
+profile
diff --git a/Resources/.DS_Store b/Resources/.DS_Store
deleted file mode 100644
index c7424949bd..0000000000
Binary files a/Resources/.DS_Store and /dev/null differ