Added home controller for empty cart static view:
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	db/development.sqlite3
Redirects to empty cart page when cart is empty
added side navigation
merge conflicts fixed
added gallery style display to the products page, fixed javascript error
moved javascript code to application.js
Add button added to product show page
Added pictures to all products
added javascript to collapse-expand review form
merge conflicts
Added pictures... again
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	db/development.sqlite3
fixed new review form
Can't add out of stock product to cart
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	app/views/products/show.html.erb
	db/development.sqlite3
Can't add out of stock product from main marketplace page
commiting to be able to pull
merge conflict
added retire product functionality