Update content, hardcode categories, begin 2 col layout
Update base vendor index and show views
fix merge conflict in custom css
dunno
fix merge conflict in login form partial
Merge pull request #25 from JessicaG/style_vendor_show_page

Style vendor show page