installing faker, need to sure up commits
adds cleans up controller by putting query in class method
updates policy to use only user polcy for all controllers
adds instance methods to change user roles
adds validations and class methods to return either edible or concentrate companies
adds validations
consolidates logic to user policy and removes redundant policies
rspec config currently works
adds factories for factory models for factory girl gem
adds specs for concentrate, edible, flower, and merchant models
random config changes
adds user factory and spec
Merge pull request #2 from githop/faker

Faker