Add websocket server
Merge branch 'master' of github.com:h0dgep0dge/artemis