adicionando teste.txt
Merge branch 'master' of https://github.com/LRoque/teste

Conflicts:
	teste.txt
delete