Merge pull request #17 from rockamorales/master

Modificaciones a consulta
Merge branch 'master' of github.com:schumy21/ClinicaWeb.git
Merge pull request #48 from mackk/master

admin
Merge pull request #18 from mackk/master

Mauro
Merge branch 'master' of github.com:schumy21/ClinicaWeb.git
Merge pull request #49 from schumy21/master

schumy 1
Merge pull request #22 from rockamorales/master

Modificaciones Schumy