Merge pull request #60 from schumy21/master

Schumy14
Merge pull request #26 from schumy21/master

Schumy
Merge pull request #61 from schumy21/master

Schumy16ABR
Merge pull request #27 from schumy21/master

Modificaciones schumy
Linea XD
Merge pull request #62 from mackk/master

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

Modificaciones