Merge with master
ScoreCalculator works
Merge branch 'master' of github.com:bessey/platypus-server