Add socketio to npm
Fix merge