yas

she now falls into lava and comes back up. we used an if statement in
game.sj #playerentity yas
Merge branch 'gh-pages' of https://github.com/MissionBit/operation-peach into gh-pages

Conflicts:
	js/resources.js