json
merged json and added edit profile
Merge pull request #1 from SuperArtie/user-edit

User edit