Quiz and new format
Merge remote-tracking branch 'origin/Min' into Mike

Conflicts:
	src/project/MapPanel.java
	src/project/WelcomeWindow.java