added edit profile
fixed conflicts
Merge pull request #6 from LizaHCarter/update-profile

Update profile