Pull latest master and fix conflict

package.json

src/assets/example.svg

src/components.d.ts

...nts/courses/hy-content-list-item/hy-content-list-item.tsx

src/components/courses/hy-content-list/hy-content-list.tsx

src/components/courses/hy-content-list/readme.md

src/components/heading/heading.scss

src/components/hy-checkbox/hy-checkbox.tsx

src/components/hy-checkbox/readme.md

...ents/hy-main-content-wrapper/hy-main-content-wrapper.scss

...nts/navigation/menu-language-item/menu-language-item.scss

...ents/navigation/menu-language-item/menu-language-item.tsx

src/components/navigation/menu-language-item/readme.md

src/components/navigation/menu-language/menu-language.scss

src/components/navigation/menu-language/menu-language.tsx

src/components/navigation/menu-language/readme.md

...e-header/hy-desktop-menu-links/hy-desktop-menu-links.scss

...te-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx

src/components/site-header/hy-desktop-menu-links/readme.md

src/components/site-header/readme.md