add arquivo teste
teste 1
teste 2
Merge branch 'master' into teste

Conflicts:
	teste.txt