stuff
merge conflict
Merge branch 'master' of github.com:stephenweaver/groupGrant
groupgrant javascript should be working now