updated links on profile page, along with inside the controller
fixed merge conflict
Merge pull request #47 from fiddler-crabs-2014/update-profile-page

Update profile page