ModuloLLaves
Merge branch 'master' of https://github.com/zenyagami/autochilango

Conflicts:
AndroidManifest.xml
Merge branch 'master' of https://github.com/zenyagami/autochilango