Merge pull request #36 from rockamorales/master

Modificaciones
Linea XD
Merge branch 'master' of github.com:mackk/ClinicaWeb.git
Colecturia
Merge branch 'master' of https://github.com/schumy21/ClinicaWeb into schumy21-master
Merge pull request #30 from rockamorales/master

Modificaciones