Merge branch 'branch_vitor'
Adicionado echo AA
adicionado texto
oi
oi
Merge branch 'branch_vitor' into branch_renato

Conflicts:
	teste.php
Merge branch 'branch_renato'

Conflicts:
	teste.php
Merge pull request #2 from vitornovo/master

Pull