Added roles to users
Merge branch 'development' of github.com:JohnJohnsonDampBox/schwagTracker into ramin
Update README.md
CanCan is working
Added cancan
Partially done cancan policies
cancan policy experiment  wasn't working, so commenting out for Craig to have functional policy
pulled ramin branch
multiple users working