Fixing rebase conflicts
Merge pull request #1 from cfrutos/nueva_rama

Cosas locas