setting up order confirmation
fixing merge conflict
tidying orderitems#assemble_orderitem
adding subtotals to cart and order confirmation
adding catch_for_duplicates
starting new cart process
adding cart_id column to orderitem table
getting add to cart to function with new cart
fixing carts#destroy
fixing cart update
fixing delete orderitem in cart
refactoring assemble_orderitem in cart
fixing orderitems#duplicate_add
adding catch for adding more products than in stock
basic tidying
Merge branch 'master' into order-checkout
Merge pull request #12 from ricarora/order-checkout

Looks good. Like the cart!