commit de nada de professor
Merge branch 'master' of https://github.com/watinha/tutorial_git
outro de exemplo
resolvendo problemas de merge