Minor styling fixes
Merge branch 'old-state'

Conflicts:
	.sass-cache/e7baa789c32f00cbaf8ad4e4dab0ae278e2b9c3a/_custom.scssc
	.sass-cache/e7baa789c32f00cbaf8ad4e4dab0ae278e2b9c3a/_settings.scssc
	library/css/style.css
	library/scss/_custom.scss
	page-templates/front-page.php
Merge remote-tracking branch 'origin/master' with CHRIS-DEVPC

Conflicts:
	library/css/style.css
	library/scss/_custom.scss
	page-templates/front-page.php