last changes
Merge branch 'group_stuff' of https://github.com/JohannaMW/beattlefit into group_stuff