Removed merge conflicts

Removed merge conflicts
Added social icons
Repaced favicon