controladores
cont
MAGE

Merge branch 'master' of https://github.com/cabrerabywaters/remel-repo

Conflicts:
	Capa_Controladores/paciente.php
	Capa_Controladores/persona.php