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

Conflicts:
	bin/Presentacio/FrmPrincipal.class
	src/Presentacio/FrmPrincipal.java