Added show results option to result settings, added checks for preview results to make sure valid
Merge branch 'master' of https://github.com/lorencs/Ualberta-Assessment-Tool-Prototype

Conflicts:
	php/resultsFuncs.php