Merge branch 'master' of github.com:BendJS/website

chriscoyier · chriscoyier · commit 4c8bb4c64c16 · 2019-04-09T19:16:06.000-07:00
# Conflicts:
#	package-lock.json
#	package.json
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-
+out/
 # Runtime data
 pids
 *.pid
diff --git a/package.json b/package.json
@@ -26,4 +26,4 @@
     "jest": "^24.5.0",
     "react-testing-library": "^6.0.1"
   }
-}
+}
