working merge
social media and disqus
another commit