added some more files to gitignore, introduced .gitattributes
* there we specify that .pbxproj is binary and should be merged with
* union strategy, for explanation see:
* http://robots.thoughtbot.com/xcode-and-git-bridging-the-gap