Fixed small things
small changes
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse
added health images
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse
farts
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse

Conflicts:
	Player.js
fixed merges and added meters to Game assets