fixed merge conflicts
fixed merge conflicts
Use the cart instead of manipulating the session everywhere
added ability for admin to adjust orders
fixed merge conflicts
Merge pull request #178 from ianderse/checkout

admin has ability to adjust order status
fixed styling bugs that were killing me
Merge pull request #179 from ianderse/checkout

fixed styling bugs that were killing me
added js functionality to manage orders
categories show
some stuff