Things
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse

Conflicts:
	Map.js
	Player.js
Start screen