added markdown-mode
merge