starting some tests for supplier path
fixing merge conflict in specs
stuff and things
Merge branch 'master' of https://github.com/Copywright/the_pivot into test-supplier
changes to supplier spec
trying out things for fonts
Merge branch 'master' of https://github.com/Copywright/the_pivot into restyle
ugh google fonts and heroku do not mix right now
Merge branch 'master' of https://github.com/Copywright/the_pivot into test-supplier
finished supplier spec. now have to make decisions on admin platform
added supplier_admin tests to user_spec
getting tests to pass.
Merge pull request #102 from Copywright/test-supplier

Test supplier
Merge pull request #101 from Copywright/adam-branch

Adam branch
woriking on items_spec
Merge branch 'master' of github.com:Copywright/the_pivot into tests
trying out shit for heroku
changed authorization for items_controller actions from require_admin to require_supplier_admin.
stuff
more fonts for heroku