social icons and twitter feed
Merge branch 'social' into dev