merged with dev, conflict fixes

src/components.d.ts

src/components/heading/heading.scss

src/components/hy-introduction/hy-introduction.scss

src/components/hy-introduction/hy-introduction.tsx

src/components/hy-introduction/readme.md

src/components/hy-main/hy-main.scss

src/index.html