Merge branch 'master' into Matthew
hbj2de
Merge branch 'Matthew' of https://github.com/Sigma-Delta-Blah/PlatformerJoy into Matthew

Conflicts:

PlatformerJoy.xcodeproj/project.xcworkspace/xcuserdata/Joe.xcuserdatad/U
serInterfaceState.xcuserstate