updating cart stuff to access items in templates
Merge branch 'longcat' of github.com:shashashasha/meshu into longcat
updating cart stuff for discounts
fixing conflict in cart