16
remve teste
Merge remote-tracking branch 'origin/master'

Conflicts:
	testeGit2/teste
a