Merge branch 'master' of https://github.com/lorencs/Ualberta-Assessment-Tool-Prototype

Conflicts:
	exam.php
	js/exam.js