add social buttons
update
commitMerge branch 'staging'

Conflicts:
	index.html