temp commit - rebuild project structure
1. draft
- webserver delivers html-file
forgotten files
Merge branch 'master' into websocket

Conflicts:
	deploy/main.js
actual test