merge in upstream changes and fix conflicts

src/assets/content/ChartGrid.js

src/assets/css/base.css

src/assets/css/main.css

src/assets/text/authors.js

src/assets/text/references.js

src/assets/text/text.js

src/components/AboutPage.vue

src/components/AuthorshipSection.vue

src/components/ChartCard.vue

src/components/ChartGrid.vue

src/components/FishAsFoodCirclePackingViz.vue

src/components/NavBar.vue

src/components/SubPage.vue

src/components/ThreatBumpChartViz.vue

src/router/index.js

src/views/VisualizationView.vue