Updated .gitignore; added .gitattributes file

- Updated .gitignore for standard Xcode projects
- Added .gitattributes file with a union merge
  stragegy for the project file so we don't
  get nightmare Xcode project merge conflics
- Removed errant .DS_Store file
Updated .gitignore; added .gitattributes file

- Updated .gitignore for standard Xcode projects
- Added .gitattributes file with a union merge
  strategy for the project file so we don't
  get nightmare Xcode project merge conflics
- Removed errant .DS_Store file
Merge branch 'repo-cleanup' of github.com:andymoe/iGCS into repo-cleanup