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)
Remove syntax highlighting for Markdown (seems to break GitHub Pages)
Merge pull request #94 from jouvin/jekyll-doc

Remove syntax highlighting for Markdown (seems to break GitHub Pages)