fixed merge conflicts
fixed merge conflicts
added ability for admin to adjust orders
fixed merge conflicts
Merge pull request #178 from ianderse/checkout

admin has ability to adjust order status