added if/else functionality for merchants/users
ul tweaking, fixed retired in embedded Ruby in product show
More merchant/user stuff
merge conflict product show
added link to all the users products
Merge pull request #36 from Elffers/product_show

Product show
resolve merge conflicts on product show page