add coderay for syntax coloring
merge conflicts
Merge branch 'development' of https://github.com/ctorstens/ScreenOverflow into add_markdown
Merge pull request #14 from ctorstens/add_markdown

Add markdown