Perfil y Camb Contraseña
Merge branch 'master' of https://github.com/OzwaldoC8/Conxca-8D

Conflicts:
	Layout/consulta.php
no se que pasa D:
Merge branch 'master' of https://github.com/OzwaldoC8/Conxca-8D

Conflicts:
	Layout/consulta.php