finished step 8
Merge branch 'master' of https://github.com/andrewcrisp/roguelike_tutorial
Trying to fix commit message.