Commit do <Fernando Ferreira>
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lista_nomes.txt
FErnando
Merge branch 'master' of https://github.com/Marabita/treinamento01
Fernando Ferreira
FErnando, venci
Merge branch 'master' of https://github.com/Marabita/treinamento01