cambios anteriores
solucion conflictos
Merge branch 'master' of https://github.com/DebianRDT/DentistaIS
nuevo esqueleto solid