Changed starting size
Quiz and new format
Merge remote-tracking branch 'origin/Min' into Adam

Conflicts:
	src/project/CountryData.java
	src/project/DataManager.java
	src/project/MapPanel.java
	src/project/WelcomeWindow.java
	src/test/CountryDataTest.java
Revert "Merge remote-tracking branch 'origin/Min' into Adam"

This reverts commit de944fc80c7cb772d2e8f5214004ae2e853ad70a, reversing
changes made to 685024299c9b65bf2d348b14af93de186ef7f3e7.