Added users socket connections to server
Merge branch 'master' of github.com:mattstyles/hermes