new commit
new commit
Merge origin/master

Conflicts:
	development/JavaQuest/src/client2/QuizView.form
	development/JavaQuest/src/client2/QuizView.java