preparing for merge with develop
Merge branch 'develop' of https://github.com/JohannaMW/battlefit into group_stuff
preparing merge with develop
Merge branch 'develop' of https://github.com/JohannaMW/battlefit into group_stuff
fixed registration template, need to style
Merge pull request #16 from JohannaMW/group_stuff

Group stuff