teste
Merge branch 'master' of https://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
Merge branch 'master' of https://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
Merge branch 'master' of https://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
Merge branch 'master' of https://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
Merge branch 'master' of https://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
Merge branch 'master' of https://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
Merge branch 'master' of https://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
Merge branch 'master' of https://github.com/Marabita/treinamento01
teste10
teste11
teste121
Merge branch 'master' of https://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
Merge branch 'master' of https://github.com/Marabita/treinamento01
teste121