Merge branch 'vdev' into develop
modified Makefile to run with baseTrash new location
Merge branch 'vdev' into develop
Merge branch 'sdev' of github.com:woodbri/vehicle-routing-problems into sdev
Merge branch 'sdev' into develop
Merge branch 'vdev' into develop