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 body fat
Merge pull request #3 from JohannaMW/chuck_dev

add body fat
merging with develop branch
add group view
merge conflict
fixed merge conflicts
merge conflict
group overview
preparing for merge with group_stuff
fixed merge conflicts
base temp login bootstrap
fix conflict for jeff first commit
Merge pull request #4 from JohannaMW/jeff_dev

Jeff dev