Merge pull request #38 from rasmusprentow/master

Everything up to date
Merge pull request #40 from rasmusprentow/scorekeeper

Merge pull request #38 from rasmusprentow/master