Merge branch 'master' into master

e8199479 · Dave Machado · GitHub · 337c6ee0 · ef3fcc10 · e8199479
Commit e8199479 authored Oct 24, 2017 by Dave Machado Committed by GitHub Oct 24, 2017
--- a/README.md
+++ b/README.md
--- a/json/entries.json
+++ b/json/entries.json
--- a/json/entries.min.json
+++ b/json/entries.min.json