Merge branch 'master' into jam2.0

rahulnwn · rahulnwn · commit 8080efa61d48 · 2014-04-17T14:56:59.000+05:30
diff --git a/package.json b/package.json
@@ -12,6 +12,9 @@
     "chalk": "0.4.0",
     "tunnel": "0.0.3"
   },
+  "devDependencies": {
+    "mocha": "~1.15.1"
+  },
   "licenses": [
     {
       "type": "MIT",
