add button
Merge branch 'master' of github.com:techno-tanoC/depot

Conflicts:
	app/controllers/line_items_controller.rb
	app/views/carts/show.html.erb
	db/migrate/20140502050344_create_line_items.rb
	db/schema.rb