Country Data

Added all the getters and setters
No idea

Doing something
Country Data

fixed some things
Merge branch 'Joe'

Conflicts:
	src/project/CountryData.java
	src/project/DataManager.java
	src/project/MapPanel.java
	src/project/StudentData.java
	src/project/WelcomeWindow.java
Merge branch 'master' into Joe