debug practice mode
Merge branch 'master' into practice-mode

Conflicts:
	Quiz Website/WebContent/feedback.jsp
Merge pull request #42 from kmblake/practice-mode

Practice mode