init
Merge branch 'master' of https://github.com/thinkadoo/httpserver

Conflicts:
	README.md