Fix markdown syntax highlighting (use Markdown)
Fix garbage from a previous conflict
Merge pull request #93 from jouvin/jekyll-doc

Fix markdown syntax highlighting (use Markdown)