users page now ability to modify roles and admin granting
fixed conflicts with users controller and routes
resolved conflict
Merge pull request #33 from lukemesiti/sambox

Resolved conflicts with user controller