Useless commit
Merge branch 'master' of https://www.github.com/johnwamburu/school

Conflicts:
	db.sqlite3_1