random user data
solve conflict
user - group link
fix conflict
Merge pull request #18 from JohannaMW/chuck_dev

Chuck dev