merge conflicts

DISCLAIMER.md

README.md

code.json

index.html

src/assets/images/hero_no-faces_5.png

src/assets/images/intersectionality_alaskan-elders.png

src/assets/images/security-insecurity-transition.png

src/assets/images/title-image.png

src/assets/images/water_insecurity_less-stylized.png

src/assets/images/water_insecurity_not-stylized.png

src/assets/images/water_security_less-stylized.png

src/assets/images/water_security_not-stylized.png

src/assets/text/text_en.js

src/components/ConclusionSection.vue

src/components/InteractiveDendrogram.vue

src/components/NarrativeIntro.vue

src/components/VizTitle.vue