work on contact form
Merge branch 'contact'

Conflicts:
	css/screen.css
	index.html
	scss/screen.scss