Merge pull request #13 from rasmusprentow/master

Pulling down from master to score
Fixed kernel. Everything works
Merge pull request #15 from rasmusprentow/scorekeeper

Scorekeeper