Solucion conflicto
Merge branch 'master' of https://github.com/ricpelo/todopelis