ServerSide
Merge branch 'master' of https://github.com/marcusthorstrom/TheQuiz.git
Merge branch 'master' of https://github.com/marcusthorstrom/TheQuiz.git