model => models
Merge branch 'master' into scorekeeper

Conflicts:
	kernel.py
Merge pull request #30 from rasmusprentow/scorekeeper

Scorekeeper
Merge pull request #32 from rasmusprentow/zebr

Merge pull request #31 from rasmusprentow/master
Merge pull request #33 from rasmusprentow/master

Merging