Merge pull request #25 from rockamorales/master

Modificaciones
Merge pull request #68 from schumy21/master

Schumy20_2
Colecturia
Merge branch 'master' of github.com:rockamorales/ClinicaWeb.git
Merge pull request #31 from rockamorales/master

Modificacione consulta web y otras