Merge branch 'ramaSergio'
Merge branch 'master' of github.com:Sofytek/inventarios