lala
Merge branch 'master' of https://github.com/Memotech/Inventario
lala