Committing to pull.
Merge branch 'master' of https://github.com/schiem/roguelike
Merge branch 'master' of https://github.com/schiem/roguelike