random user data
solve conflict
Merge pull request #16 from JohannaMW/group_stuff

Group stuff
update my branch with dev
Merge branch 'develop' of https://github.com/JohannaMW/battlefit into jeff_dev
Merge pull request #17 from JohannaMW/jeff_dev

Jeff dev
user - group link
fix conflict
Merge pull request #18 from JohannaMW/chuck_dev

Chuck dev
merge