Merge branch 'pol' of https://github.com/carlosep93/PROP_CAMIONS into josep

Conflicts:
	camio/src/camio/Cjt_Elements.java
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into josep
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into josep
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into josep
tour
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into josep
tour sense acabar
Merge branch 'josep'
probo puto josep
Merge branch 'joan'
Merge branch 'pol'
CjtElements que abans era tour molt acabadota ja
Merge branch 'josep'
suprimerixo Tour pq es diu CjtElements
Merge branch 'pol'
Merge branch 'pol'