Merge pull request #54 from schumy21/master

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

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

Colecturia