Updated Data class to make display graphics more accessible. Updated
display class to allow for characters. Re-enabled display in mainClass.
Updated Display to allow characters. Updated Data to make land graphics
more accessible. Updated mainClass to re-enable Display class.
Added new class for later functionality.
Merge remote-tracking branch 'origin/master' into issue3
Redid Display to only have map window. Added splashscreen
Commit to pull
Rewrote Display to run faster. Edited mainClass to make use of new
Display.
Merge remote-tracking branch 'origin/master' into issue3
Merge branch 'master' of ssh://git@github.com/eronth/SurvivalTrials.git

Conflicts:
	SurvivalTrials/src/mainClass.java
Some sleep edits and lake fill edits.

Merge branch 'master' of ssh://git@github.com/eronth/SurvivalTrials.git

Conflicts:
	SurvivalTrials/src/mainClass.java
Merge remote-tracking branch 'origin/master' into issue3