Merge pull request #30 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
Merge pull request #69 from schumy21/master

Schumy21
Merge pull request #32 from rockamorales/master

Modificaciones
Merge pull request #70 from mackk/master

merge
Merge pull request #26 from rockamorales/master

Modificaciones