merge resolve dependency conflict

README.md

@@ -62,8 +62,13 @@ On a low-memory machine, eg. a DigitalOcean 512MB instance, you will need to ena
 
 To make the application start on boot, run the following:
 
-    pm2 start npm --name dubdiff -- run serve:prod
+    # initialize pm2 to start on boot with the systemd boot manager
     pm2 startup systemd
+    
+    # start the app with pm2
+    pm2 start npm --name dubdiff -- run serve:prod
+    
+    # save the current pm2 config so that it can be reloaded on boot
     pm2 save
 
  [Digital Ocean: How To Set Up a Node.js Application for Production on Ubuntu 16.04](https://www.digitalocean.com/community/tutorials/how-to-set-up-a-node-js-application-for-production-on-ubuntu-16-04)

dist/main.css

@@ -1,3 +1,11 @@
 #masthead .header {
   font-size: 4em;
 }
+
+ins {
+  background-color: #dbffdb;
+}
+
+del {
+  background-color: #ffdddd;
+}

package.json

@@ -50,7 +50,7 @@
     "babel-register": "^6.18.0",
     "chai": "^3.5.0",
     "copyfiles": "^0.2.2",
-    "cpy": "^5.0.0",
+    "cpy-cli": "^1.0.1",
     "cross-env": "^3.1.3",
     "json-loader": "^0.5.4",
     "mocha": "^3.2.0",

src/server/index.js

@@ -65,7 +65,7 @@ app.route('/')
 
 
 app.listen(PORT, function () {
-  console.log('Server listening on port 8080.')
+  console.log(`Server listening on port ${PORT}.`)
 })