merge
finish user story: can edit profile
Merge pull request #13 from sandycjyu/ProfileEdit

Profile edit