new commit
Merge branch 'master' of https://github.com/Sigma-Delta-Blah/PlatformerJoy

Conflicts:

PlatformerJoy.xcodeproj/project.xcworkspace/xcshareddata/PlatformerJoy.x
ccheckout
	PlatformerJoy/PlatformerMyScene.m
working