commit
commit
Merge branch 'master' of https://github.com/0Kuklos0/Quiz

Conflicts:
	Answer.class
	PlayQuizClient.class
	Question.class
	Quiz.class
	QuizServer.class
	SetUpQuizClient.class
	SetUpQuizInt.class
	SetUpQuizIntImp.class