Ejercicio 5

laboratorio 1
no se que es esto

lel
imagen_prueba

sfjslfsl
Merge branch 'marco-rodriguez' of https://github.com/eslopez28/Primer-Prueba into marco-rodriguez
Merge remote-tracking branch 'origin/Wendy'
Merge remote-tracking branch 'origin/master' into jorge.argds
Merge remote-tracking branch 'origin/master' into marco-rodriguez
Probando
Merge branch 'Wendy'
Probando
Merge branch 'jorge.argds'
Arreglando
Arreglando