Made some changes to make things nicer
other changes
Merge branch 'master' of https://github.com/Jemeyr/Awesome-Kart

Conflicts:
	src/Controller/ControllerManager.java
	src/States/StateContext.java