updates seed data for sub_orders
fixes merge conflict
fixes bugs on order management page
Merge branch 'master' of https://github.com/tyrbo/the_pivot
adds panels to account overview page
starts updating inventory for orders
fixes merge conflicts
Merge pull request #162 from chadbrading/master

updates sub orders seed data