arraylist
Merge branch 'twoOpt'

Conflicts:
	projecte_prop/src/projecte_prop/Relation.java
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
a