Merge remote-tracking branch 'origin/Lauren' into Mike

Conflicts:
	src/project/DataManager.java
Spacing minor changes
MapPanel MapType specific changes
added laurens pictures
getting laurens pictures
Merge remote-tracking branch 'origin/Min' into Mike
updated countrydata.txt
InfoBox Updates
updated DM
DataFile change
parseData now in constructor
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
commitig
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
Merge branch 'Adam' into Mike

This reverts commit 33e3d4b1f977403883ab8e2413c25f7dfd70c0f3.

Conflicts:
	src/project/DataManager.java
Revert "Merge branch 'Adam' into Mike"

This reverts commit 0c3b11dce890976a8e5625dae4a16f4541fd7ea4, reversing
changes made to 726805d34efa5cd4664f0dd11b73382c500c6683.
Revert "Merge remote-tracking branch 'origin/Min' into Mike"

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