html email, updated form
Merge branch 'master' of https://github.com/MattSanford/Let-Us-Spray

Conflicts:
	index.php
	rust-removal/index.php
	sass/screen.scss
	stylesheets/screen.css