Merge pull request #14 from rockamorales/master

Modificaciones a consulta
Merge branch 'master' of github.com:schumy21/ClinicaEJB.git
Merge pull request #15 from rockamorales/master

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

schumy 1