add coderay for syntax coloring
merge conflicts
go back in time to fix migration
Merge pull request #13 from ctorstens/fix_migration

Fix migration
Merge branch 'development' of https://github.com/ctorstens/ScreenOverflow into add_markdown
Merge pull request #14 from ctorstens/add_markdown

Add markdown
Merge pull request #15 from ctorstens/development

Development. Hopefully will fix heroku database.