Phycsing some of the Fhycics
Merge branch 'master' into Keith

Conflicts:
	PlatformerJoy/PlatformerMyScene.m
Merge remote-tracking branch 'origin/Joev2' into Keith
ai is semi complete