Servidor-client funcionant
Merge branch 'master' of https://github.com/bhellin/smartrepair.git

Conflicts:
	pac4/bin/uoc/tdp/smartrepair/pac/properties/configuracion.properties
fetMerge branch 'master' of https://github.com/bhellin/smartrepair

Conflicts:
	pac4/src/uoc/tdp/smartrepair/pac/subs3reparacions/MDITest.java