#409 Add a new git configuration file so that XCode project merging run smoothly (courtesy of http://robots.thoughtbot.com/xcode-and-git-bridging-the-gap).