Merge pull request #28 from rockamorales/master

Modificaciones
Merge pull request #29 from rockamorales/master

Modificaciones
Merge branch 'master' of github.com:schumy21/ClinicaWeb.git
Colecturia
Merge branch 'master' of https://github.com/schumy21/ClinicaWeb into schumy21-master