"criar teste1.txt criando conflito "
Merge branch 'master' of https://github.com/mcsnows/Projeto1

Conflicts:
	teste1.txt