Merge remote-tracking branch 'origin/Min' into Adam

Conflicts:
	src/project/MapPanel.java
	src/project/WelcomeWindow.java
Finally got the TextBox to show up

it was setOpaque….
Added comments to StudentData, etc.

added hasContinentBeenSeen() method
Prevent user from bailing on pre-test

Added a boolean to MapPanel and a check in the action handler to
prevent them from leaving the pre-test of their own accord.
Also some minor comment wrangling
Minor quiz-related changes

mostly comment and TODO wrangling
Minor Changes
Merge branch 'Adam' into Min

Conflicts:
	src/project/MapPanel.java
	src/project/WelcomeWindow.java
New methods for changing continent & country

Actual work done in MapPanel; stubs added to CountryData and
ContinentData as needed
Actually create a button for each country

Changed constructor to build a button for each country, as that got
overlooked somehow. Also some misc stub and comment changes.
Radio Buttons and Background

Added radio buttons and actually got the JPanel to paint the image as
the background as opposed to just have it be the icon for a JLabel
Forgot comment
Init QuizRunner

moved quiz management skeleton from MapPanel to a new QuizRunner class
Map Crops and Initial UpdateInfoBox
More QuizRunner work
Merge remote-tracking branch 'origin/Min' into Adam

Conflicts:
	src/project/MapPanel.java
Merge branch 'Adam'
Merge remote-tracking branch 'origin/Lauren'

Conflicts:
	src/project/MapPanel.java
Merge branch 'master' into Lauren