2
2
Merge branch 'pol'

Conflicts:
	projecte_prop/src/Drivers_class/DriverClass_CtrlDomini.java
	projecte_prop/src/projecte_prop/CjtTours.java