Novos Padrões
Merge branch 'master' of https://github.com/movibe/ConexaoDB

Conflicts:
	conexao.php