master
Merge branch 'master' of https://github.com/augustotrindade/teste.git

Conflicts:
	index.php
Merge remote-tracking branch 'origin/master' into desenvolvimento