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

Jeff dev