On branch master
Your branch is up-to-date with 'origin/master'.

Changes to be committed:
	modified:   depot/app/controllers/line_items_controller.rb
	modified:   depot/app/models/cart.rb
	modified:   depot/app/views/carts/show.html.erb
	new file:   depot/db/migrate/20141220163608_add_quantity_to_line_items.rb
	new file:   depot/db/migrate/20141220164718_combine_items_in_cart.rb
	modified:   depot/db/schema.rb
	new file:   history/history-201412201235.txt
	new file:   journal/journal-201412201236.txt

Iteration E1: Creating a Smarter Cart