Resolve merge conflict

package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/llk/scratch-www#readme",
   "dependencies": {
-    "bunyan": "1.5.0",
+    "bunyan": "1.5.1",
     "compression": "1.5.2",
     "express": "4.13.3",
     "express-http-proxy": "0.6.0",
@@ -40,7 +40,8 @@
     "file-loader": "0.8.4",
     "json-loader": "0.5.2",
     "jsx-loader": "0.13.2",
-    "node-sass": "3.3.2",
+    "minilog": "2.0.8",
+    "node-sass": "3.3.3",
     "react": "0.13.3",
     "react-modal": "0.3.0",
     "react-onclickoutside": "0.3.1",

src/components/navigation/navigation.jsx

@@ -2,7 +2,7 @@ var React = require('react');
 var classNames = require('classnames');
 var xhr = require('xhr');
 
-var log = require('../../log.js');
+var log = require('../../lib/log.js');
 
 var Api = require('../../mixins/api.jsx');
 var Session = require('../../mixins/session.jsx');

src/lib/log.js

@@ -0,0 +1,4 @@
+var minilog = require('minilog');
+minilog.enable();
+
+module.exports = minilog('www');

src/log.js

@@ -1,4 +0,0 @@
-var bunyan = require('bunyan');
-
-var Logger = bunyan.createLogger({name: 'scratch-www'});
-module.exports = Logger;

src/mixins/api.jsx

@@ -1,7 +1,7 @@
 var cookie = require('cookie');
 var defaults = require('lodash.defaults');
 var xhr = require('xhr');
-var log = require('../log.js');
+var log = require('../lib/log.js');
 
 var Api = {
     getCsrf: function (callback) {