Clean up!
Merge branch 'develop' of https://github.com/mrwinton/TheExcellentAdventure into develop

Conflicts:
	src/master/Server.java