added new classes
Merge branch 'master' of https://github.com/JumpWar/glowing-octo-ninja

Conflicts:
	bin/Sprite.class