User addition to groups with conditions
Fixed the Conflicts
Merge pull request #10 from elitenomad/Pranava_Users

Pranava users