Haciendo conflictos
Resolviendo conflictos
Merge branch 'master' of https://github.com/drtoranaga/test