Changes
Merge branch 'master' of https://github.com/12ftguru/site_theme

Conflicts:
	style.css