Github's suggested gitignore for XCode 5.
Removed VCS metadata that was causing merge conflicts. Github seems to recommend NOT having this file under source control.
Ignore local configuration.
Merge branch 'new_work' of github.com:uw-it-aca/spacescout-ios into new_work