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