Update based on site
Merge branch 'master' of https://github.com/Innov8Young/theme

Conflicts:
	style.css