Merge pull request #24 from schumy21/master

schumy
Merge pull request #25 from schumy21/master

Colecturia
Linea XD
Merge branch 'master' of github.com:mackk/ClinicaWeb.git
Merge pull request #21 from mackk/master

Mauro