Merge branch 'Lauren' into Mike
Merge branch 'Mike' of https://github.com/aj499/Project-4 into Mike
random question generation

Conflicts:
	src/project/DataManager.java
	src/project/MapPanel.java
	src/project/WelcomeWindow.java
random question generation changes**
Merge remote-tracking branch 'origin/Min' into Lauren

Conflicts:
	src/project/DataManager.java
	src/project/MapPanel.java
	src/project/WelcomeWindow.java
Merge branch 'Mike' into Lauren
woo
Merge branch 'Lauren' into Joe

Conflicts:
	src/project/CountryData.java