profile photo
fixing conflict
add text input style
Merge pull request #8 from JohannaMW/jeff_dev

Jeff dev
adjustments
conflicts
conflicts
conflicts
group overview
Merge pull request #10 from JohannaMW/group_stuff

Group stuff
user dashboard