ñ
Merge branch 'master' of
https://github.com/GrupoPracticaLB1/MaquinesEscurabutxaques

Conflicts:
	bin/Aplicacio/Controlador.class
	bin/Domini/Contracte.class
	bin/Domini/ContracteMajorista.class
Merge branch 'master' of https://github.com/GrupoPracticaLB1/MaquinesEscurabutxaques
Merge branch 'master' of https://github.com/GrupoPracticaLB1/MaquinesEscurabutxaques
PanRevisarMaquina