basket test
Merge branch 'master' of http://github.com/cs360f14/WillametteShippingCalculator-Group2