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
2
mitja implementació de cjtTours
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into joan
 a
Merge branch 'pol'
tour sense acabar
Merge branch 'josep'
probo puto josep
Merge branch 'joan'
Merge branch 'twoOpt'

Conflicts:
	projecte_prop/src/projecte_prop/Relation.java
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
polet
Merge branch 'pol'
CjtElements que abans era tour molt acabadota ja