fixup! Merge branch 'master' of https://github.com/tsprlng/game-craft-2014