Small changes to shipments interface.

Still a little bit user unfriendly where you have to format your strings perfectly.
Merge branch 'master' of https://github.com/Alex0216/DD1334-Lab2 into mhotan
Merge pull request #3 from Alex0216/mhotan

Small pretty much meaningless changes to shipments