Delete random semi-colon in view
Fix conflict in views/cart/show/
Merge branch 'master' of github.com:BobGu/dinner_dash
Merge branch 'master' of github.com:BobGu/dinner_dash
Fixed Retire back to Destroy
Added retire and false default to attribute
Merge branch 'master' of github.com:BobGu/dinner_dash
added validates to item model
prettied the items index page up
Merge branch 'real_better_index_items_view'
Merge branch 'beautify_footer'
retire is all done
Merge branch 'master' of github.com:BobGu/dinner_dash
Merge branch 'retire'
added padding and shit
Merge branch 'beautify_footer'
Merge branch 'master' of github.com:BobGu/dinner_dash
Tiny tweak.
Final tweaks.
changed setting to try to make paperclip work