Functionality: redirected user to items, added bootstrap buttons
save before pull
Merge branch 'master' of github.com:BobGu/dinner_dash
cart is cleared after checkout
initial save
Merge branch 'admin-editing-views'
Fixes insignificant merge conflict in app controller.
inserted footer and main content are for home page
Create order status update from ordered to cancelled
Merge branch 'implement_authentication'
Fixed minor merge conflict in Items Controller.
Merge branch 'master' of github.com:BobGu/dinner_dash
Added User seed datat and password validation on user model
added an about_us section
Create state machine for orders with 'ordered' status to 'cancel'
got rid of everthing to do with price_slice
added a photo slider
Merge branch 'home-page'
made some minor changes to font color and padding
Cart transformation to Order almost done(exclamation point).