trocando imagem do template
Merge branch 'master' of https://github.com/conradoojr/conradoojr.github.io

Conflicts:
	template/template.jpg