merge
Merge branch 'master' of https://github.com/zsofitoth/httpserver

Conflicts:
	httpserver/ContentType.cs
	httpserver/HttpServer.cs