Comit foo
yaaaaaaaaaaaaaaaaaa
resolviendo conflictos peralta
Merge branch 'master' of https://github.com/kraker-orion/Optimum
pequeñas modificaciones