random user data
solve conflict
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
last changes
Merge branch 'group_stuff' of https://github.com/JohannaMW/beattlefit into group_stuff
merge
Merge pull request #20 from JohannaMW/group_stuff

Group stuff
group page styling
Merge branch 'develop' of https://github.com/JohannaMW/battlefit into jeff_dev