added user data
added group logic
resolved merge conflicts
Merge pull request #3 from varunrau/page-3

Page 3