testing sublime 3 git plugin
Added shopping cart scaffold
fixed merge conflicts