WebServer can now show Serverlog
WebServer can now show Serverlog
Merge origin/master

Conflicts:
	src/chatserver/ChatServer.java
Webserver can now show Online Users
Merge branch 'master' of https://github.com/CodingCo/Server

Conflicts:
	logfiles/serverlog0.txt
	src/chatserver/ChatServer.java