Made it nice
Merge remote-tracking branch 'origin/MoreObjects' into MoreObjects

Conflicts:
	Pentris/src/Game.java