arruma um, estraga outro
Merge branch 'master' of https://github.com/mvendramim/portfolio-may

Conflicts:
	css/about.css
	css/navbar.css
	css/work.css
	index.html
Resolvendo conflitos