Commit before merge
Preston merge with creating cart
 Commit before pull
fix conflicts
pre merge commit
Merge Description
merge before commit
Fix merge conflicts
some layout changes
Merge pull request #23 from richsalvucci/master

Layout Changes
new updates by Gene
Merge pull request #24 from genenettles2/master

new updates by Gene
merge