Remove redundant <main> tag from mains.
Merge branch 'feature/30-website-redesign' of github.com:sjockers/teikei-1 into 30-website-redesign

Conflicts:
	app/views/contact_messages/new.html.haml