tom merge
Merge branch 'master' of https://github.com/kyle3mh/biggreendoor

Conflicts:
	css/style.css
	css/style.scss
Merge branch 'master' of https://github.com/kyle3mh/biggreendoor