Student shenanigans
Merge branch 'master' of https://github.com/ZAYEC77/CDB

Conflicts:
	protected/views/student/index.php