Whopsie, this will not work?
Merge branch 'master' of https://github.com/PhroZenOne/VectorRallyEvolved

Conflicts:
	js/main-game.js