commit fredy
Merge remote-tracking branch 'origin/master'

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
Merge branch 'master' of https://github.com/Marabita/treinamento01
Merge remote-tracking branch 'origin/master'

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