some time on my desktop
merging

Conflicts:
	dissertacao.pdf