Merge branch 'Joev2'

Conflicts:

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