added current_supplier method to app controller, fixed weird bug with /cart_items -- had to move get /:slug to bottom of routes.rb
working on orders controller test
Merge branch 'master' of github.com:Copywright/the_pivot into multitenancy
Merge branch 'master' of github.com:Copywright/the_pivot into multitenancy
small edit to generate_orders on seed
Merge branch 'master' of github.com:Copywright/the_pivot into multitenancy
Update orders_controller_spec.rb
Merge pull request #66 from Copywright/testing

small edit to generate_orders on seed
Merge pull request #67 from Copywright/adam-branch

Adam branch
Merge pull request #69 from Copywright/multitenancy

Multitenancy
fixes to seed file
seed file looks snazzy
Merge pull request #70 from Copywright/testing

Testing
displaying seed data works
Merge pull request #71 from Copywright/testing

displaying seed data works
new supplier view