Merge branch 'master' into Mike
some data parsing for datamanager
CountryData

Some setters and getters
Merge branch 'Joe' into Mike
CountryData

Setters
Merge branch 'Joe' into Mike
Country Data

Getters and Setters
To commit
Merge branch 'Joe' of https://github.com/aj499/Project-4 into Joe

Conflicts:
	src/project/CountryData.java
Merge branch 'Joe' into Mike

Conflicts:
	src/project/CountryData.java
updated branch
Merge branch 'Mike' into Lauren
continent getters and setters
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 'Lauren' into Min

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