Shipment Complete
Merge branch 'master' of https://github.com/cjsolomon/Mulit-Modal

Conflicts:
	MMRP/src/core/Shipment.java