Added node_modules to gitignore
Added initial version of server (socket.io only)
Fixed a conflict