Fixed the last of the recorded bugs.
Merge branch 'master' of github.com:bishiguro/AdventureGame