over again with git problems
Merge branch 'master' of github.com:kiniry/objective-c

Trying to fix this