q
q
Merge branch 'master' of https://github.com/gitprofit/httpsrvr

Conflicts:
	HttpServer/src/HttpServer.hpp
	HttpServer/src/RequestHandler.hpp