cleanup
Merge branch 'master' of https://github.com/JSpeight/shopping-cart