Merge branch 'master' of github.com:glenegbert/dinner-dash
Merge pull request #32 from glenegbert/cart

Cart
Merge branch 'master' of github.com:glenegbert/dinner-dash
remove extra pry gem in gemfile
heroku cleanup: removed extraneous order & order items files
Merge branch 'master' of github.com:glenegbert/dinner-dash
moved cancan gem out to make avail to prod
admin can change items category, items and categories many to many, photos
before actions applied
push stack down from carts controller to model
authorization working.. again
categories assignment is working
imlemented remove item
removed extraneous spec files
update quantity implemented
added additional tests for modifying items in dashboard
Merge branch 'authorization' into merger1
resolved merger conflicts
fixed gemfile.lock
merged #10 and resolved conflicts