adding profile page
merged conflicts
Merge pull request #2 from imshah/ishah_branch

Ishah branch