add markdown and gem 'redcarpet'
Merge branch 'add_markdown'
merge 'master' and modify conflict
Merge branch 'master' of https://github.com/JeskTop/giggle