Business Statistics minor fixes to allow the code to compile.

Signed off by Henry J. Wylde, Sivan Fesherman & Hugh Jackson
Costs now only return greater cost of weight cost or volume cost,
reflects hui ma's instructions
Assumption made here that cost to company relies on both volume and
weight, rather than just the maximum of the two
Merge branch 'master' of git@github.com:rtheunissen/KPSmart-Team-4.git

Conflicts:
	src/deliverysystem/DeliverySystem.java