Updated Xcode project file
Update .gitignore to ignore Xcode source control file

Conflicts:

carma_pack.xcodeproj/project.xcworkspace/xcshareddata/carma_pack.xccheck
out