teste 2
Merge branch 'branch_vitor' into branch_renato

Conflicts:
	teste.php