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

Conflicts:
	The Quiz Game/src/MVC_test/GController.java