Merge pull request #72 from schumy21/master

schumy22
Merge pull request #34 from rockamorales/master

Modificaciones
Linea XD
Linea XD
Merge pull request #73 from mackk/master

mod
Colecturia
Merge pull request #74 from schumy21/master

Schumy24Abril2013
Merge branch 'master' of github.com:rockamorales/ClinicaWeb.git
Merge pull request #28 from rockamorales/master

Modificaciones