added ObjectiveC.gitattributes; help with auto-merging .pbxproj files