Changing to kramdown from maraku
Merge branch 'dev'