Correct world-building

Construction of world names, links now match the overall story.
Merge branch 'master' of https://github.com/GoesOnGhost/DataStructAlgorithmsConfProject2014

Conflicts:
	MainWindow.class