Removed unsolved conflicts from last commit.
Added link to social share icons.
Commit conflicts solved.