model => models
Merge branch 'master' into scorekeeper

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

Scorekeeper