loca
Merge branch 'master' of https://github.com/dnascimento/darionascimento.com
Merge branch 'master' of https://github.com/dnascimento/darionascimento.com
Merge branch 'master' of https://github.com/dnascimento/darionascimento.com
Merge branch 'master' of https://github.com/dnascimento/darionascimento.com
update site
change site
Merge branch 'master' of https://github.com/dnascimento/darionascimento.com

Conflicts:
	darionascimento.com/node_modules/marked/package.json
	darionascimento.com/public/css/style.css