Changes before merge
Merge branch 'master' of https://github.com/johnwamburu/school

Conflicts:
	db.sqlite3_1
Updates to subject teacher assignment
Merge branch 'master' of https://github.com/johnwamburu/school

Merging new printing classes into local.
Upload mugshots updated
Now merged with local