group work commit test shipping
Merge pull request #12 from KackieM/master

group work commit testing ship/cost