renamed
Merge branch 'master' of https://github.com/yorkhackspace/ConsoleGame

Conflicts:
	server/sounds/fanfare.ogg