Merge pull request #35 from rockamorales/master

Modificaciones
Linea XD
Colecturia
Merge pull request #75 from mackk/master

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

Modificaciones