Merge pull request #25 from blackshadowshade/game

Checks out fine on pagoda for me.