updated profile page so user can not update username. Updated tests
fixed merge conflicts
Merge pull request #14 from dyoachim/profile_page

Profile page