Syncing Complete
Committing
WelcomeWindow UI Changes
datamanager

delete stuff
Merge branch 'Min' into Joe

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