quantity fixed?
fixes #140, fixes #142, fixes #114
fixes #136
merge conflicts and test passing
beginning new quantity adventure
Fixes the tests that I broke with the login redirect change
Merge branch 'master' of https://github.com/tyrbo/the_pivot into mailers
Fixes Josh demo account. Again. Also separates pending admins and regular supplier admins.
Fixes schema merge conflict
Merge branch 'allisonlarson-fix_cart_quantity'
Merge branch 'master' of https://github.com/tyrbo/the_pivot into mailers