merged

package.json

@@ -1,46 +1,52 @@
 {
-	"name":            "Prototyper",
-	"version":         "0.0.1",
-	"main":            "server.js",
-	"config":          {
-		"port": "8000"
-	},
-	"engine":          "node 0.10.38",
-	"private":         "true",
-	"dependencies":    {
-		"async":      "~0.2.8",
-		"bson":       "~0.1.8",
-		"connect":    "~2.7.9",
-		"express":    "~3.2.4",
-		"handlebars": "~1.0.10",
-		"less":       "~1.3.3",
-		"markdown":   "~0.5.0",
-		"mongodb":    "~1.2.14",
-		"rethinkdb":  "^2.0.2",
-		"share":      "~0.6.0",
-		"underscore": "~1.4.4",
-		"when":       "~2.1.0"
-	},
-	"devDependencies": {
-		"sockjs": "~0.3.7",
-		"chai":   "*",
-		"mocha":  "*",
-		"sinon":  "*",
-		"groc":   "*"
-	},
-	"repository":      "git://github.com/aikomastboom/Prototyper.git",
-	"author":          "Aiko Mastboom",
-	"license":         "Unknown",
-	"readmeFilename":  "README.md",
-	"directories":     {
-		"test": "test"
-	},
-	"description":     "README.md",
-	"scripts":         {
-		"test":    "./node_modules/.bin/mocha",
-		"install": "./bin/installit",
-		"deploy":  "./bin/deployit",
-		"doc":     "./bin/docit",
-		"cov":     "./bin/coverit"
-	}
+  "name": "Prototyper",
+  "version": "0.1.0",
+  "main": "server.js",
+  "config": {
+    "port": "8000"
+  },
+  "engine": "node 6.1.0",
+  "private": true,
+  "dependencies": {
+    "share": "0.6.3",
+    "browserchannel": "1.2.0",
+    "hat": "0.0.3",
+    "ws": "0.6.4",
+    "connect": "2.7.9",
+    "express": "3.2.4",
+    "bson": "0.1.8",
+    "mongodb": "~1.2.14",
+    "rethinkdb": "^2.0.2",
+    "handlebars": "1.0.10",
+    "underscore": "1.4.4",
+    "less": "1.3.3",
+    "when": "2.1.0",
+    "markdown": "0.4.0",
+    "async": "0.2.8",
+    "passport": "0.2.1",
+    "passport-local": "1.0.0",
+    "connect-roles": "3.1.0"
+  },
+  "devDependencies": {
+    "sockjs": "0.3.7",
+    "chai": "1.10.0",
+    "mocha": "2.1.0",
+    "sinon": "1.12.2",
+    "groc": "0.8.0"
+  },
+  "repository": "git://github.com/aikomastboom/Prototyper.git",
+  "author": "Aiko Mastboom",
+  "license": "Unknown",
+  "readmeFilename": "README.md",
+  "directories": {
+    "test": "test"
+  },
+  "description": "README.md",
+  "scripts": {
+    "test": "./node_modules/.bin/mocha",
+    "install": "./bin/installit",
+    "deploy": "./bin/deployit",
+    "doc": "./bin/docit",
+    "cov": "./bin/coverit"
+  }
 }