inicial commit
Merge branch 'master' of http://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt

:wq
meu commit
Merge branch 'master' of http://github.com/Marabita/treinamento01

Conflicts:
	lista_nomes.txt
Merge branch 'master' of http://github.com/Marabita/treiname`````
Conflicts:
	lista_nomes.txt
Merge branch 'master' of http://github.com/Marabita/tr

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

Conflicts:
	lista_nomes.txt
Merge branch 'master' of http://github.com/Marabitaeinamento01

Conflicts:
	lista_nomes.txt