UI Major Changes (Scaled Images/Paint)
Merge branch 'Mike' into Min

Conflicts:
	src/CountryData.txt
	src/project/DataManager.java
	src/project/MapPanel.java
Merge remote-tracking branch 'origin/Min' into Mike

Conflicts:
	src/CountryData.txt
	src/project/DataManager.java
	src/project/MapPanel.java
Revert "parseData now in constructor"

Conflicts:
	src/CountryData.txt
	src/project/DataManager.java
	src/project/MapPanel.java