Fixed up a small error in the code from my merging.  It now compiles and
runs, but there's a bug in the dungeon which causes random parts to turn
invisible.  I'm not sure if this is something caused by the merge or the
refactoring of the code to "game" instead of "canvas"