Updated source/_posts/2013-01-03-xcode-projects-without-merge-pains.markdown