No idea what this commit is for
Im even more confused now

Conflicts:
	build/classes/Engine/Geometry/Circle.class
	build/classes/Engine/Geometry/Rectangle.class
	build/classes/Engine/Geometry/Shape.class
	build/classes/GameStates/IntroState.class
	build/classes/GameStates/Options.class
	build/classes/GameStates/SinglePlayerGame.class
	build/classes/GameStates/TestBench$1.class
	build/classes/GameStates/TestBench$2.class
	build/classes/GameStates/TestBench.class
	nbproject/private/private.xml