preparing for pull
Merge branch 'group_stuff' of https://github.com/JohannaMW/battlefit into group_stuff