Mofidiquei
mMerge branch 'master' of https://github.com/johnaltan/teste_git

Conflicts:
	outro.txt