Add seed data items and two vendors
Merge branch 'master' into seed_data
setup vendor controller, index with all vendors, show with all items
vendors controller, index, and show setup
Add new item seeds
removed old assets

changed homepage image and header
Fix master merge conflict
fixed merge conflicts
Jeff route example/namespace commented out
remove vendors.yml.swp fild and two extraneous spaces from items.yml
merge conflicts
browse by vendor dropdown links working
Update content, hardcode categories, begin 2 col layout
added more images, new logo, favicon

changed out some header info and image
changed header, rearranged things

added coloring to links

added coloring to footer
finalized css stuff for the night
Update base vendor index and show views
fix merge conflict in custom css
fixed login css bs
dunno