Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Ball.class
	bin/Game.class