added method to add products with categories
Merge branch 'master' of github.com:brigid2718/goatique into products_categories
fixed merge conflict in product.rb
i'm trying to fix something?
Merge branch 'master' of github.com:brigid2718/goatique
formatting changes
started product edit form
formatting changes
made method and view to edit product
merge conflict
actually fixed merge conflict
added link to edit product for logged in merchant
change edit link to button
adding links between pages
Merge branch 'master' of github.com:brigid2718/goatique into products_categories
added edit view and update method to merchant
added edit link to product display partial
added categories field to edit form
added link from header to logged in merchant's page
added delete method for products