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

Conflicts:
	bin/janus/engine/SimpleGraphicsAbsorber.class
	bin/plat/interfaces/Player.class
	bin/plat/main/Main.class