Merge pull request #25 from jmlb0003/jesusjc

vaaa!!
Merge pull request #26 from jmlb0003/jesusjc

Definitivo
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
Cambios en el controlador
Registrar-Notificar de los observadores del controlador
Ya lo dejamos por ahora....que Blas no se entera de na...
Merge pull request #31 from jmlb0003/JoseBranch

Jose branch
Mas cambios
Merge bueno ahiii
Merge pull request #33 from jmlb0003/JoseBranch

Jose branch
Mas cambios
Merge pull request #34 from jmlb0003/jesusjc

Mas cambios
Mas cambios
Merge pull request #35 from jmlb0003/jesusjc

Cambios en la vista
Mas cambios