Fixed merge head addition in the xcode project file causing it to be unparsable
Merge pull request #570 from stowellm/ms542

Fixed merge head addition in the xcode project file causing it to be unp...