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
ai siemness
better work on ai and bitmasks
Merge branch 'master' into Keith

Conflicts:
	PlatformerJoy/BasicEnemy.m
	PlatformerJoy/EnemyData.h
	PlatformerJoy/EnemyData.m
Revert "Merge branch 'master' into Keith"

This reverts commit 77919ed534ebda5ee930f90179f7d943b5146af1, reversing
changes made to 625978a8200ecbacdb03d3b811b1c70eef1da884.
Merge branch 'Keith' of https://github.com/Sigma-Delta-Blah/PlatformerJoy into Keith

Conflicts:
	PlatformerJoy.xcodeproj/project.pbxproj

PlatformerJoy.xcodeproj/project.xcworkspace/xcuserdata/Joe.xcuserdatad/U
serInterfaceState.xcuserstate
	PlatformerJoy/BasicEnemy.h
	PlatformerJoy/BasicEnemy.m
	PlatformerJoy/EnemyStats.h
	PlatformerJoy/EnemyStats.m
	PlatformerJoy/God.m
	PlatformerJoy/PlatformerMyScene.m
	PlatformerJoy/PlayerData.h
	PlatformerJoy/PlayerData.m
Merge branch 'Keith'

Conflicts:
	PlatformerJoy.xcodeproj/project.pbxproj

PlatformerJoy.xcodeproj/project.xcworkspace/xcuserdata/Joe.xcuserdatad/U
serInterfaceState.xcuserstate
	PlatformerJoy/BasicEnemy.h
	PlatformerJoy/BasicEnemy.m
	PlatformerJoy/EnemyStats.h
	PlatformerJoy/EnemyStats.m
	PlatformerJoy/God.m
	PlatformerJoy/PlatformerMyScene.m
	PlatformerJoy/PlayerData.h
	PlatformerJoy/PlayerData.m