adds authorization for users and groups
fixes merge conflict
Merge pull request #5 from kelseyledford/authorization

adds authorization for users and groups