add product listing and links to merchants view show.html.erb

I edited the merchants view show.html.erb, to display a specific merchant's current products.  I'm not sure if this was the right thing to do, and this was part of Katie's code, so we should probably look at it together before merging.