websocket
Merge branch 'master' of github.com:larusx/http_server

Conflicts:
	README.md
	a.html
	server.c