updating for multisite
before pulls from Laura
trying to avoid conflict
expanded
proper sync
merges into master on github
Merge branch 'single-site' of github.com:grayayer/global

Conflicts:
	scss/style.scss
	style.css
	template-globalhome-de.php