a
Merge branch 'master' of https://github.com/chgeuer/Quizzer

Conflicts:
	Quizzer.Web/Hubs/QuizConnection.cs
a