Fix css and some markup
Merge branch 'clean-css'
Merge branch 'master' into blog

Conflicts:
	contato.html
	css/main.css