2
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS

Conflicts:
	projecte_prop/src/Drivers_class/DriverClass_CtrlDomini.java
	projecte_prop/src/Stubs/Tour.java
	projecte_prop/src/projecte_prop/TspGA.java