minor changes commented out
fixing conflict
Merge branch 'gh-pages' of https://github.com/bjornbjarnsteins/RogueLife into gh-pages