minor fix in shopping cart
merge conflict fixed
minor change
Merge pull request #8 from akhileshdarjee/master

Taxes and charges fieldname fixed