la lala

.......
Merge remote-tracking branch 'origin/master'

Conflicts:
	bd_cadastro (7).sql
	conectaBanco.php
	index.php
	index_user.php
	my_js.js