tarea 7 y 6
tarea1
tarea2
tarea3
Merge pull request #143 from alejandro2003/master

tareas 6 y 7