Update PlatformerMyScene.m
adso;hagjagjkagkopgaer
physics for the tiles
another file
no useless files
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
Merge branch 'KeithNew'

Conflicts:

PlatformerJoy.xcodeproj/project.xcworkspace/xcshareddata/PlatformerJoy.x
ccheckout
	PlatformerJoy/PlatformerMyScene.m
Update README.md
Delete MapOneX.plist
Delete MapOneY.plist
This should be fixed now?
Blah 3
Updated with all 3 of our contributions!
All 3 of our updates are here!
Merge branch 'master' into Joe

Conflicts:
	PlatformerJoy.xcodeproj/project.pbxproj

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