Socket.io

Fixed socket.io calls.
Merge branch 'master' of github.com:mjsalerno/Unhackathon