register models at admin
add category to group model
adding choice field
Add Group form
preparing for pull
Merge branch 'group_stuff' of https://github.com/JohannaMW/battlefit into group_stuff
correction
add group view
merge conflict
merge conflict
group overview
group view
merge
group
merge
Merge pull request #6 from JohannaMW/group_stuff

Group stuff
fix conflict