Merge pull request #20 from rockamorales/master

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

schumy13