teste
Commit 1
commitei denovo
commit
Merge pull request #1 from thiago122/master

mudança
adicionei o config
Merge branch 'master' of https://github.com/soapdog/aula-vx-git

is eh
Merge remote-tracking branch 'upstream/master'