ControlServer shows log
Merge remote-tracking branch 'origin/master'

Conflicts:
	Webserver/Webserver/Controlserver/logfile.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	Webserver/Webserver/Controlserver/logfile.txt