eric's turn.
Merge branch 'master' of github.com:BrainScraps/trivial_game