Merged conflict

1 files changed, 88 insertions, 0 deletions

diff --git a/node_modules/socket.io/package.json b/node_modules/socket.io/package.json
new file mode 100644
index 0000000..00421fa
--- /dev/null
+++ b/node_modules/socket.io/package.json
@@ -0,0 +1,88 @@
+{
+  "name": "socket.io",
+  "version": "1.4.8",
+  "description": "node.js realtime framework server",
+  "keywords": [
+    "realtime",
+    "framework",
+    "websocket",
+    "tcp",
+    "events",
+    "socket",
+    "io"
+  ],
+  "main": "./lib/index",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/Automattic/socket.io.git"
+  },
+  "scripts": {
+    "test": "mocha --reporter dot --slow 200ms --bail"
+  },
+  "dependencies": {
+    "engine.io": "1.6.11",
+    "socket.io-parser": "2.2.6",
+    "socket.io-client": "1.4.8",
+    "socket.io-adapter": "0.4.0",
+    "has-binary": "0.1.7",
+    "debug": "2.2.0"
+  },
+  "devDependencies": {
+    "expect.js": "0.3.1",
+    "istanbul": "0.4.1",
+    "mocha": "2.3.4",
+    "superagent": "1.6.1",
+    "supertest": "1.1.0",
+    "zuul-ngrok": "3.2.0"
+  },
+  "contributors": [
+    {
+      "name": "Guillermo Rauch",
+      "email": "rauchg@gmail.com"
+    },
+    {
+      "name": "Arnout Kazemier",
+      "email": "info@3rd-eden.com"
+    },
+    {
+      "name": "Vladimir Dronnikov",
+      "email": "dronnikov@gmail.com"
+    },
+    {
+      "name": "Einar Otto Stangvik",
+      "email": "einaros@gmail.com"
+    }
+  ],
+  "gitHead": "2a092bd2fb8b37fb2dd896798b7c619e5104448e",
+  "bugs": {
+    "url": "https://github.com/Automattic/socket.io/issues"
+  },
+  "homepage": "https://github.com/Automattic/socket.io#readme",
+  "_id": "socket.io@1.4.8",
+  "_shasum": "e576f330cd0bed64e55b3fd26df991141884867b",
+  "_from": "socket.io@latest",
+  "_npmVersion": "3.7.3",
+  "_nodeVersion": "5.9.1",
+  "_npmUser": {
+    "name": "rauchg",
+    "email": "rauchg@gmail.com"
+  },
+  "dist": {
+    "shasum": "e576f330cd0bed64e55b3fd26df991141884867b",
+    "tarball": "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "rauchg",
+      "email": "rauchg@gmail.com"
+    }
+  ],
+  "_npmOperationalInternal": {
+    "host": "packages-12-west.internal.npmjs.com",
+    "tmp": "tmp/socket.io-1.4.8.tgz_1466734972834_0.10649802000261843"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz",
+  "readme": "ERROR: No README data found!"
+}