Added markdown.js.
Fixed to use marked.js.
Merge branch 'hotfix-markdown' into gh-pages

Conflicts:
	js/main.js
	js/markdown.js