all the old changes squashed
Merge branch 'master' of https://github.com/drvinceknight/two_thirds_of_the_average_game