delete answer link on profile page and on question page
if statement on question show page added
resolve merge conflicts
Merge branch 'master' into answer-scores