Merge branch 'master' into Uchija
para arreglar
Revert "para arreglar"

This reverts commit 4d1a70aa6411a9038d4261d3a76d524aea4b58eb.
Revert "Revert "para arreglar""

This reverts commit cf01d3e5818aa347ad84f887dcd8539f8fa8faa0.
Revert "Revert "Revert "para arreglar"""

This reverts commit 276ceecf703bd5d5db941f1ef9858e913c7bc897.
Revert "Revert "Revert "Revert "para arreglar""""

This reverts commit d1a9cd0088814080c2b4ec4de58b1b32262a32fa.
Revert "Revert "Revert "Revert "Revert "para arreglar"""""

This reverts commit cc8378819a4e46053ecf4de438f626dfb076deb6.
Revert "subiendo"

This reverts commit 19749cf31581c7acd7dae12261595618f5cb2d18.
Revert 3f4600c..03d9578

This rolls back to commit 3f4600cea9eb541f38b29589a15644ad630cfa5f.
arreglando
arreglando segundo
persistencia json
Merge branch 'Uchija'