Commit do Joao Marcos
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lista_nomes.txt
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lista_nomes.txt
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lista_nomes.txt
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lista_nomes.txt
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lista_nomes.txt
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lista_nomes.txt
Merge remote-tracking branch 'remotes/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