Web site doc: remove overlooked conflict
Merge pull request #92 from jouvin/jekyll-doc

Web site doc: remove overlooked conflict
Fix markdown syntax highlighting (use Markdown)
Fix garbage from a previous conflict