todo done
Merge branch 'master' into all-examples
better chat implementation
Merge branch 'example-chat2' into all-examples

Conflicts:
	httpd.sh