group overview
merge conflicts
Merge pull request #13 from JohannaMW/chuck_dev

user dashboard
Merge branch 'develop' of https://github.com/JohannaMW/beattlefit into group_stuff
group in dashboard
Merge pull request #14 from JohannaMW/group_stuff

Group stuff
solve conflict