Merge pull request #21 from mackk/master

Mauro
Merge pull request #22 from rockamorales/master

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

Schumy14