fixed
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages

Conflicts:
	MeleeEnemy.js
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages