added subtotal and grand total returns to shopping cart
Merge branch 'master' of github.com:Egogre/drinking_dash