Controles finales
Merge branch 'master' of https://github.com/PadawanSofware/Tiquicia into Erick