add contact form
Merge branch 'develop'

Conflicts:
	css/style.css
	sass/style.sass