More JUnit

ShipmentHistory Completed, Shipment started.  Jordan's murder is pending
Merge branch 'master' of https://github.com/cjsolomon/Mulit-Modal

Conflicts:
	MMRP/MMRP.log.1