Simple collision display
Merge branch 'master' of https://github.com/HeyHumansGames/marvel-of-technology

Conflicts:
	views/index.html
Added MainLevel, managing arrow inputs, enter to start game