modify gitignore and gitattributes

.gitattributes

@@ -0,0 +1 @@
+*.pbxproj -crlf -diff -merge

.gitignore

@@ -1,37 +1,27 @@
-# Mac OS X Finder and whatnot
+# OS X
 .DS_Store
-
-# XCode (and ancestors) per-user config (very noisy, and not relevant)
-*.mode1
-*.mode1v3
-*.mode2v3
-*.perspective
-*.perspectivev3
-*.pbxuser
-
-#for Xcode 4
-xcuserdata
-*.xcworkspace
-
-# Generated files
-VersionX-revision.h
-
-
-# build products
-build/
+.DS_store
+profile
+
+# XCode and built products
+*xcodeproj/*pbxuser*
+*xcodeproj/*per*
+*xcodeproj/*mode*
+*tmproj
+External/GHUnit/*
+
+# for Xcode 4
+*xcodeproj/xcuserdata
+*xcodeproj/project.xcworkspace
+
+# built products
+build
 *.o
 
-# Other source repository archive directories (protects when importing)
+# Other source repository archive directories
 .hg
 .svn
 CVS
 
-
-# automatic backup files
-*~.nib
-*.swp
-*~
-*(Autosaved).rtfd/
-Backup[ ]of[ ]*.pages/
-Backup[ ]of[ ]*.key/
-Backup[ ]of[ ]*.numbers/
+# Autosaved
+#~.nib/