Conflictos en base
Merge branch 'master' of https://github.com/RevolutionaryOS/Pueblos-Fundacionales
Login funcional