admin path is broken
fixed merge
small fixes and commits
store has_many categories created
store categories query now using includes
used includes for store products as well
changed admin products paths
two failing tests left
need to fix cart
fixed floating cart
took out flash, added form in cart for orders
fixed order controller failing tests
fixed merge conflicts