WIP
Merge branch 'master' of github.com:davincicoders/davinci_shopping_cart