added social links
Merge branch 'master' into who-we-are

Conflicts:
	index.markdown