Se corrigen errores
Se mergea
Merge branch 'master' of github.com:Melecio/proy2-ci4835