Started implementing random events, but there is no chance that it will occur yet, because no event screen exists.
Merge branch 'master' into jack/dev
Merge with myself from master to jack/dev
Forgot to get rid of other branches' stuff on the merge
Begin recovery of all my files :(
I think I recovered all my lost work about the mulitiple encounters.
Files were the same
Merge with master
Merge branch 'master' of https://github.com/gem-5/last-adventures
Fixed StoryReader
Merge remote-tracking branch 'origin/master' into james/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/PlanetController.java