commit 2

algunas cosas
commit 3

arreglo
Merge remote-tracking branch 'origin/AdolfBranch' into SergioR