Cleaned up controlserver and server.
Merge branch 'master' of https://github.com/Alexnagel/webserver

Conflicts:
	Webserver/ControlServer2.cs
control in directory
Merge branch 'master' of https://github.com/Alexnagel/webserver

Conflicts:
	Webserver/ControlServer2.cs
	Webserver/Program.cs