Blah...
Merge branch 'master' into Joev2

Conflicts:

PlatformerJoy.xcodeproj/project.xcworkspace/xcuserdata/Joe.xcuserdatad/U
serInterfaceState.xcuserstate
Merge pull request #24 from Sigma-Delta-Blah/Joev2

Joev2