Treballant en Comanda Peces
Treballant en Comanda peces stock
Merge branch 'master' of https://github.com/bhellin/smartrepair

Conflicts:
	pac4/src/uoc/tdp/smartrepair/pac/servidor/RMIImpl.java
Merge branch 'master' of https://github.com/bhellin/smartrepair