mudanca1
Merge branch 'master' of https://github.com/brunogomescomp/Teste

Conflicts:
	1.txt
delete 1.txt