Commit before merge
Preston merge with creating cart
 Commit before pull
fix conflicts
pre merge commit
Merge Description
Merge pull request #22 from genenettles2/master

the shopping cart is working
merge before commit
Fix merge conflicts
some layout changes
Merge pull request #23 from richsalvucci/master

Layout Changes
new updates by Gene