starting some tests for supplier path
seeded second platform admin
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
merge
supplier associated with a user in seeds
blah
fixed seed error
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
Merge pull request #102 from Copywright/test-supplier

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

Adam branch
Merge branch 'master' of https://github.com/Copywright/the_pivot into restyle