Student home editions
Merge branch 'master' of https://github.com/pacsmile/csc181project

Conflicts:
	scripts/classes/class_dosql.py
	scripts/pages/studhome.py