modifed delete route for product
Merge branch 'master' into product-show
test commit
fixed merge conflict in routes.rb
fixed merge conflict
Merge pull request #16 from JavaRabbit/product-show

Product show