trying to fix repo conflicts
trying to fix repo conflicts
minor gui stuff and fixes for quizrunner
Merge origin/master

Conflicts:
	Quiz Application/src/GUIDesign/StudentGUIPanel.java
	Quiz Application/src/Question/ValidateQuestion.java