setup redcarpet for markdown viewing
updated merge error
Merge pull request #20 from 3B7/markdown

Markdown