adding profile image as the upload button
fix conflict on index.js and base
Merge pull request #15 from JohannaMW/jeff_dev

Jeff dev