added Cart.total
Merge branch 'master' of github.com:speedracr/shopz