Shipment - 3/4 Done

Junit Tests for Shipment.  3/4 completed
Merge branch 'master' of https://github.com/cjsolomon/Mulit-Modal