More QuizRunner work

have now implemented the question picking algorithm; and have designed
the flow between MapPanel and QuizRunner; it should prove easy to
implement; famous last words lol
country pictures added
Quiz logic work mostly in MapPanel

with accompanying support work in QuizRunner

this should complete the work for Quiz (*fingers-crossed*)
Merge branch 'Mike' into Lauren
Merge remote-tracking branch 'origin/Adam' into Lauren
hi
Merge remote-tracking branch 'origin/Lauren' into Mike

Conflicts:
	src/project/DataManager.java
added laurens pictures
getting laurens pictures
Merge remote-tracking branch 'origin/Min' into Mike
updated countrydata.txt
updated DM
parseData now in constructor
Merge branch 'Mike' into Min

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