ignore files.
Merge branch 'master' of https://github.com/tearsofphoenix/GraceRoad

Conflicts:

GraceRoad.xcodeproj/project.xcworkspace/xcuserdata/Mac003.xcuserdatad/Us
erInterfaceState.xcuserstate