Merge branch 'Mike' into Joe

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