Commit do Luiz Fernando Cirigliano
conflito 1
Merge remote-tracking branch 'remotes/origin/master'
Merge remote-tracking branch 'remotes/origin/master'
Merge branch 'master' of https://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
luiz fernando