Adding authors and disqus working
Fixing merge conflict