Commit para merge
merge resuelto
commit para merge
Merge branch 'design_erika' into design_luz
Commit, agregados los botones
Merge branch 'design_luz' into design_erika
show de solucion terminado
Merge branch 'design_luz' into design_erika
Show solution resuelto