Errores corregidos, pruebas corriendo
Merge branch 'master' of https://github.com/lrrinaudo/ixchel