Small stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/src/com/thecolony/tractus/graphics/game/Game.java