no me acuerdo :S
Merge branch 'master3' of https://github.com/armandoSosa/inventario.git into master3