updated changes
Merge branch 'kiope'
updated changes
updated merge conflict
Merge pull request #8 from vyash8/kiope

added user profile page