Fuck you, tom
Added timer on movement
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse

Conflicts:
	Player.js
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse
Added player health