reset attempt
Merge branch 'master' of github.com:ChristopherLeslie/StockholmGame
game ending
Merge branch 'master' of github.com:ChristopherLeslie/StockholmGame