fiddling
merge
remove errors
added subtotal to order_items
delete order items from cart
add cancelled and shipped columns to OrderItem model
can update quantity on checkout page
Merge branch 'master' of https://github.com/kemccabe/betsy_rails
cc number is hidden and accepts large numbers
fix merge conflicts in orders_controller