Merge in master
Remove duplicate 'products by category'
Add all scrap items to layout
Fight with CSS
Merge master into user
Left-align browse-by.h2
Change 'all products' to 'all scraps'
Change 'merchant' to 'seller' in alyout
Add montreal bagel
Change styling of homepage
Merge branch 'master' into user