no message
Merge branch 'master' of https://github.com/brunoguazina/Portfolio

* 'master' of https://github.com/brunoguazina/Portfolio:
  layout da pagina inicial do portfolio (html/sass)

Conflicts:
	index.html
	lib/css/format.css
	lib/sass/format.scss