Merge branch 'gh-pages'
Swapping margin for text-indent on the citation
Merge branch 'master' into gh-pages