Merge branch 'master' of https://github.com/lrohret/COMS362

Conflicts:
	ShippingSystem/config.properties
	ShippingSystem/src/system/truck/TruckImpl.java
	ShippingSystem/src/system/truck/TruckManagerImpl.java
MOre
Merge branch 'master' of https://github.com/lrohret/COMS362

Conflicts:
	ShippingSystem/config.properties
	ShippingSystem/src/system/truck/TruckManagerImpl.java