udacity-style 'overlay' question

- had multiple choice, short answer, and multiple select
- need to do grading for this question
Merge branch 'master' of https://github.com/lorencs/Ualberta-Assessment-Tool-Prototype

Conflicts:
	question.php