Definitivo
Merge pull request #27 from jmlb0003/jesusjc

Jesusjc
saaaa
Merge pull request #28 from jmlb0003/sonia

Sonia
Definitivo
Merge pull request #29 from jmlb0003/jesusjc

Definitivo
Mas cambios
Merge pull request #30 from jmlb0003/jesusjc

Mas cambios
Merge origin/master into JoseBranch
Cambios al crear el modelo y el controlador