f1
Merge branch 'master' of github.com:rannooo/valimised
Commented websocket out
fixed merge conflict