Quiz.java UPDATE:
	- new variables
	- constructor update
Merge branch 'master' of https://github.com/LievenNuyts/SteveLievenEmin