rebased branch
Merge pull request #8 from tiger-swallowtails-2014/Profile_page

rebased branch