João Victor
Merge branch 'master' of https://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
João Victor Merge Fixed