para carlos
toma carlos! coño
.
.
HE afegit alguna clase, dema la especificare
Inclusio de clases lectura/escriptura fitxers
mes organitzat però sense compilar encara 1.1
aerg
a
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS

Conflicts:
	camio/nbproject/private/private.properties
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS

Conflicts:
	camio/nbproject/private/private.properties
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS

Conflicts:
	camio/nbproject/private/private.properties
+algprim, de test
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into twoOpt
Merge branch 'joan'
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
arraylist
pujo el projecte verdader
Merge branch 'joan'
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS