profile page
fixed merge problem
Merge pull request #13 from gkadillak/robert-feature

profile page