teste
teste dessa poha
Merge branch 'master' of github.com:blmacedo/Laboratorio

Conflicts:
	teste.txt