preparing for merge with develop
Merge branch 'develop' of https://github.com/JohannaMW/battlefit into group_stuff
adding profile image as the upload button
fix conflict on index.js and base
Merge pull request #15 from JohannaMW/jeff_dev

Jeff dev
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
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
fix conflict