Merge branch 'master' of https://github.com/nicks451/ViceHunterSaga

Conflicts:
	Game.js