fuck all
 tot
tot
avera
borrar coses camio
Merge branch 'pol'

Conflicts:
	camio/src/camio/Cjt_Elements.java
	projecte_prop/src/projecte_prop/Cjt_Elements.java
	projecte_prop/src/projecte_prop/Element.java
noves clases
cjt_elem borrat
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into joan
swegfaw
Merge branch 'joan'
fuck all
fuck all
afegeixo Cjt_tours
.
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into joan
asf
.
fs
fs