have to pull
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git
Fixed In Air Move
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git

Conflicts:
	src/plat/mainGraphics/Platformer.java