Proto working YAY :D
Merge branch 'master' of https://github.com/HeyHumansGames/marvel-of-technology

Conflicts:
	app.js
	public/scripts/inputscenemain.js
Merge branch 'master' of https://github.com/HeyHumansGames/marvel-of-technology

Conflicts:
	public/scripts/managers/AssetManager.js
	public/scripts/menus/MainLevel.js