Gestures changed
Merge branch 'master' of https://github.com/Wooanna/SwordfishyGame

Conflicts:

SwordfishGame.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad
/UserInterfaceState.xcuserstate