git problems
erge branch 'master' of github.com:kiniry/objective-c

I hope i dont fuck anything up