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
bootstrap renovation
update CHECKLIST
Merge branch 'master' of github.com:H6C5/dinner_dash
  because
Merge branch 'master' into development-hilary
Merge branch 'bootstrap'
fixed redirected routes for user log in
notice for login and merged user flow
problem with user-authorization
Merge branch 'master' of github.com:H6C5/dinner_dash
Update CHECKLIST.markdown
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