uploaded from live site to update local branch
Merge branch 'master' of https://github.com/SeaMonster-Studios/trace_register_wp_theme

Conflicts:
	css/sass/sms-styles/global.scss
	css/sass/sms-styles/header.scss
	footer.php
	header.php
	inc/parts/about.php
	inc/parts/clients.php
	inc/parts/solutions.php
	style.css
	template-contact.php
	template-homepage.php