minor cleanup
Merge branch 'gh-pages' of https://github.com/bjornbjarnsteins/RogueLife into gh-pages
MeleeEnemy still needs work, dt'd his movements
resolving merge conflicts
Merge branch 'gh-pages' of https://github.com/bjornbjarnsteins/RogueLife into gh-pages