Just syncing this up
Merge branch 'master' of https://github.com/jtmarmon/codium

Conflicts:
	teacher-mainpage.php