qeqewq
qweqe
kjdsk
Merge origin/master

Conflicts:
	cliente/src/interfazGrafica/bodeguero/vista_bodeguero.java
hola