added categories to product display
fixed broken link on merchants page
made categories controller and views