fix database
green except for checkout test
Merge remote-tracking branch 'origin' into development-cart
Merge branch 'master' of github.com:H6C5/dinner_dash into development-cart
add order_id to cart_items table
-broken
change seed prices to be in dollars and cents not pennies
add simplecov gem to see test coverage
order show functionality working
make tests pass
Merge branch 'master' into development-hilary
problem with user-authorization
Merge branch 'master' of github.com:H6C5/dinner_dash
fixing merge conflicts w/ development-hilary
Merge branch 'master' of github.com:H6C5/dinner_dash into user-authorization
fix merge conflicts
split orders and carts for real this time
Merge branch 'master' of github.com:H6C5/dinner_dash
Merge branch 'master' into development-hilary
seperates orders and carts