Merge pull request #2 from Alex0216/mhotan

Syntactic changes to shipments interface.
Merge branch 'master' of https://github.com/Alex0216/DD1334-Lab2 into mhotan