Merge pull request #3 from JohannaMW/chuck_dev

add body fat
base temp login bootstrap
fix conflict for jeff first commit
Merge pull request #4 from JohannaMW/jeff_dev

Jeff dev
fixed register
Merge branch 'develop' of https://github.com/JohannaMW/battlefit into jeff_dev
Merge pull request #5 from JohannaMW/jeff_dev

Jeff dev
fix conflict
merge conflict