update my branch with dev
Merge branch 'develop' of https://github.com/JohannaMW/battlefit into jeff_dev
Merge pull request #17 from JohannaMW/jeff_dev

Jeff dev