commiting to pull
Merge pull request #1 from audreycarlsen/cart

Cart
Added purchase time to order confirmation
Fix merge conflicts
Fixed browse by merchant show page
retired products are not displayed, added 'activate'  button to retired products
merge conflict
linked seller's name in ptoduct description to seller's store
Order confirmation lists ordered products
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	db/development.sqlite3
working on create method for purchases
fixed conflicts
edited category view
Merge branch 'master' of github.com:audreycarlsen/sloth_express
removed unnecessary 'back' buttons
Order confirmation page works, but has a ton of code that shold be in the model
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	db/development.sqlite3
Fixed bug where you couldn't click on my account
subtract item order quantity from product stock
fixed merge conflict