cambios menores y conf
Merge branch 'master' of https://github.com/ricpelo/todopelis
Merge branch 'master' of https://github.com/ricpelo/todopelis
solucion errores
Merge branch 'master' of https://github.com/ricpelo/todopelis