cahnge in serverlog
Merge branch 'master' of https://github.com/CodingCo/Server

Conflicts:
	logfiles/serverlog0.txt