Taller
Usuaris
Excepcions Subs1
Gestores Subs1
Model TableTallers
RmiSubs2
Tornar a fer RmiSubs2Impl
Tornar a fer RmiSubs4Impl
GestorUsuaris
UsuariBD
Subs1Connexió
Servidor
GestorDiscoConexion
Merge branch 'master' of https://github.com/bhellin/smartrepair.git

Conflicts:
	pac4/src/uoc/tdp/smartrepair/pac/servidor/RmiSubs2.java
	pac4/src/uoc/tdp/smartrepair/pac/servidor/RmiSubs2Impl.java