fixed merge conflicts, added new nav

This commit is contained in:
Al Duncanson
2018-10-24 18:09:23 -04:00
15 changed files with 476 additions and 193 deletions

3
.gitignore vendored
View File

@@ -1,2 +1,3 @@
node_modules/
.vscode/
.vscode/
.netlify