Merge remote-tracking branch 'origin/Lauren' into Mike
up to date
Merge remote-tracking branch 'origin/Lauren' into Mike

Conflicts:
	src/project/DataManager.java
updated data manager rand questions country data cont data
Parsing updated

Parsing now reads in continents and countries
Merge branch 'Joe' into Mike

Conflicts:
src/project/DataManager.java
src/project/MapPanel.java
src/project/WelcomeWindow.java
Merge branch 'master' into Adam
i
Merge branch 'Mike'

Conflicts:
	src/project/DataManager.java
j
Merge branch 'master' into Mike

Conflicts:
	src/project/DataManager.java
Merge branch 'Lauren' into Min

Conflicts:
	src/project/DataManager.java
	src/project/MapPanel.java
	src/project/WelcomeWindow.java
g
Merge branch 'Lauren' into Min

Conflicts:
	src/project/DataManager.java
	src/project/MapPanel.java
	src/project/WelcomeWindow.java
getting laurels stuff
Merge remote-tracking branch 'origin/Lauren' into Mike
Merge branch 'Adam' into Mike
Figuring stuff out
f
Merge branch 'Adam' into Min

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