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

index.html

@@ -277,17 +277,17 @@ function linkify( selector ) {
 								<td>Apples</td>
 								<td>$1</td>
 								<td>7</td>
-							<tr>
+							</tr>
 							<tr>
 								<td>Lemonade</td>
 								<td>$2</td>
 								<td>18</td>
-							<tr>
+							</tr>
 							<tr>
 								<td>Bread</td>
 								<td>$3</td>
 								<td>2</td>
-							<tr>
+							</tr>
 						</tbody>
 					</table>
 				</section>

package.json

@@ -7,7 +7,7 @@
   "main": "js/reveal.js",
   "scripts": {
     "test": "grunt test",
-    "start": ""
+    "start": "grunt serve"
   },
   "author": {
     "name": "Hakim El Hattab",
@@ -40,10 +40,6 @@
     "grunt": "~0.4.0",
     "node-sass": "~0.9.3"
   },
-  "licenses": [
+  
-    {
+  "license": "MIT"
-      "type": "MIT",
-      "url": "https://github.com/hakimel/reveal.js/blob/master/LICENSE"
-    }
-  ]
 }

plugin/multiplex/index.js

@@ -9,7 +9,7 @@ var staticDir	= express.static;
 io				= io.listen(app);
 
 var opts = {
-	port: 1948,
+	port: process.env.PORT || 1948,
 	baseDir : __dirname + '/../../'
 };