Revert "basura el merge"

This reverts commit a536565a0562205e2cc4f6cb227353d9ee1d736f.
Revert "Revert "tratando de hacer merge""

This reverts commit 8394e69357bf5b2395629ff1661e1471bb89f4ee.
estoy perdido