teste conflito renato
teste conflito renatoooo
Merge branch 'master' into branchNovo

Conflicts:
	renato.txt
bvbvb