Merge pull request #1 from brandr/master

pull pls
Merge pull request #2 from brandr/roguelike_test

Merge pull request #1 from brandr/master