first commit
add socket.io
merge conflicts