i dunuo
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git

Conflicts:
	src/plat/player/Player.java