cambios menores
Merge branch 'master' of https://github.com/javierperezferrada/tarea_final_taller into javier