Ip ventana cliente
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/vista/PrincipalSubastaCliente.java