teste conflito
Merge branch 'master' of https://github.com/sysmael/teste.git

Conflicts:
	teste.txt
teste
teste
Merge branch 'master' of https://github.com/sysmael/teste.git

Conflicts:
	teste.txt