2
fuck all
hola
conflicts resolts
ja funcionant
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
2
2
Merge branch 'pol'

Conflicts:
	projecte_prop/src/Drivers_class/DriverClass_CtrlDomini.java
	projecte_prop/src/projecte_prop/CjtTours.java
opciones algoritmos
funcionant amb ctrl domini no staic
no ho borreu
paneles
herencia de element
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
nose que es
 corretjit l'error