contact & main style fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/layouts/main.css.sass
	app/assets/stylesheets/layouts/style.css.scss