added ObjectiveC.gitattributes; help with auto-merging .pbxproj files
swap -crlf -diff for binary. update comment string
Merge pull request #6 from adamtait/master

add ObjectiveC.gitattributes