temp
Merge branch 'master' of https://github.com/zzwind/depot

Conflicts:
	app/controllers/carts_controller.rb
	app/views/carts/show.html.erb