first commit of a Friday night pet project
Merge branch 'master' of github.com:seriousfox/serious_schoolmaster

Conflicts:
	.gitignore