Merge branch 'about-landing' of https://github.com/wngo/edumelbdev into about-landing

Conflicts:
	_design/sass/components/_heroImage.scss
	_design/sass/pages/_basic.scss
HeroImage fixed height
Fix