modificaciones de usuarios
Merge branch 'Working' of https://github.com/ErickHernandez/BodegueroHero into Working

Conflicts:
	BodegueroHero/mainwindow.ui
Merge branch 'Working' of https://github.com/ErickHernandez/BodegueroHero into Working

Conflicts:
	BodegueroHero/mainwindow.cpp
removi conflictos