Merge pull request #8 from rasmusprentow/master

Into scorekeeper with latest
Merge pull request #10 from rasmusprentow/zebr

Zebr
Merge pull request #11 from rasmusprentow/zebr

Zebr
Merge pull request #12 from rasmusprentow/scorekeeper

Merge pull request #8 from rasmusprentow/master
Merge pull request #14 from rasmusprentow/master

Pulling the merge