Merge branch 'master' into features/prime

Author: ryanspradlin

README.md

@@ -412,6 +412,11 @@ Promise.all([ promise1, promise2 ]).then(([ user1, user2]) => {
 });
 ```
 
+## Video Source Code Walkthrough
+
+**DataLoader Source Code Walkthrough (YouTube):**
+
+<a href="https://youtu.be/OQTnXNCDywA" target="_blank" alt="DataLoader Source Code Walkthrough"><img src="https://img.youtube.com/vi/OQTnXNCDywA/0.jpg" /></a>
 
 
 [@schrockn]: https://github.com/schrockn

package.json

@@ -42,7 +42,7 @@
     "babel": "5.8.21",
     "babel-runtime": "^5.8.x",
     "babel-core": "5.8.22",
-    "babel-eslint": "4.1.6",
+    "babel-eslint": "4.1.8",
     "chai": "3.4.1",
     "coveralls": "2.11.6",
     "eslint": "1.10.3",