initial commit
Merge https://github.com/epdittmer/httpd