Added link to merchant page from product show
Fixed typo in controller
Merge pull request #58 from Elffers/merchant_link

Merchant link