yes
Merge branch 'master' of https://github.com/MaxTayler/My-Portfolio

Conflicts:
	_site/assets/css/all.css
Added hero-bg to code to css