Merge branch 'master' of https://github.com/hakimel/reveal.js

Conflicts:
	README.md
	index.html
	js/reveal.js
	package.json
	plugin/speakernotes/client.js

1 files changed, 21 insertions, 17 deletions

diff --git a/package.json b/package.json
index 823d951..830b877 100644
--- a/package.json
+++ b/package.json
@@ -1,30 +1,34 @@
 {
-  "author": "Hakim El Hattab",
   "name": "reveal.js",
-  "description": "HTML5 Slideware with Presenter Notes",
-  "version": "1.5.1",
+  "version": "2.3.0",
+  "description": "The HTML Presentation Framework",
+  "homepage": "http://lab.hakim.se/reveal-js",
+  "author": {
+    "name": "Hakim El Hattab",
+    "email": "hakim.elhattab@gmail.com",
+    "web": "http://hakim.se"
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/hakimel/reveal.js.git"
   },
   "engines": {
-    "node": "0.8.*"
+    "node": "~0.8.0"
   },
   "scripts": {
-    "start": "node ./plugin/multiplex/index.js"
+    "test": "grunt jshint"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://github.com/hakimel/reveal.js/raw/master/LICENSE"
-    }
-  ],
   "dependencies": {
-    "underscore": "1.3.3",
-    "express": "2.5.9",
-    "socket.io": "0.9.6",
-    "mustache": "0.4.0"
+    "underscore": "~1.3.3",
+    "express": "~2.5.9",
+    "socket.io": "~0.9.6",
+    "mustache": "~0.4.0"
   },
-  "devDependencies": {},
-  "subdomain": "revealjs"
+  "devDependencies": {
+    "grunt-contrib-jshint": "~0.2.0",
+    "grunt-contrib-cssmin": "~0.4.1",
+    "grunt-contrib-uglify": "~0.1.1",
+    "grunt-contrib-watch": "~0.2.0",
+    "grunt": "~0.4.0"
+  }
 }