tjarratt/SpaceFortress — pull request #1 by andymoe (2013-06-27 06:37:42+00:00)
Title: Add git attributes

- Mark pbxproj as binary w/ union merge strategy
so merging branches with files added sucks less