merge conflicts w preview & backgrounds

3 files changed, 5 insertions, 3 deletions

diff --git a/plugin/multiplex/index.js b/plugin/multiplex/index.js
index 35df8e3..6f5d8b1 100644
--- a/plugin/multiplex/index.js
+++ b/plugin/multiplex/index.js
@@ -30,6 +30,7 @@ app.configure(function() {
 });
 
 app.get("/", function(req, res) {
+	res.writeHead(200, {'Content-Type': 'text/html'});
 	fs.createReadStream(opts.baseDir + '/index.html').pipe(res);
 });
 
diff --git a/plugin/notes-server/index.js b/plugin/notes-server/index.js
index 8643f5d..5535c90 100644
--- a/plugin/notes-server/index.js
+++ b/plugin/notes-server/index.js
@@ -30,6 +30,7 @@ app.configure(function() {
 });
 
 app.get("/", function(req, res) {
+	res.writeHead(200, {'Content-Type': 'text/html'});
 	fs.createReadStream(opts.baseDir + '/index.html').pipe(res);
 });
 
diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html
index 2333878..8af43fb 100644
--- a/plugin/notes/notes.html
+++ b/plugin/notes/notes.html
@@ -213,9 +213,9 @@
 							now = new Date();
 
 						diff = now.getTime() - start.getTime();
-						hours = parseInt( diff / ( 1000 * 60 * 60 ) );
-						minutes = parseInt( ( diff / ( 1000 * 60 ) ) % 60 );
-						seconds = parseInt( ( diff / 1000 ) % 60 );
+						hours = Math.floor( diff / ( 1000 * 60 * 60 ) );
+						minutes = Math.floor( ( diff / ( 1000 * 60 ) ) % 60 );
+						seconds = Math.floor( ( diff / 1000 ) % 60 );
 
 						clockEl.innerHTML = now.toLocaleTimeString();
 						hoursEl.innerHTML = zeroPadInteger( hours );