Fixed subtotal
Merge branch 'master' of https://github.com/Tang8330/drinkUp