fix
Merge branch 'master' of https://github.com/LievenNuyts/SteveLievenEmin

Conflicts:
	Opdracht_1/src/controller/CreateQuizController.java