Masse greier
Merge branch 'master' of https://github.com/hmatland/Quiz

Conflicts:
	WebApplication1/TakeQuiz.aspx