fin problemas
Merge branch 'Desarrollo' of https://github.com/FancySoftware/namiki.git into Desarrollo