add some tests for code blocks, fix the body closing tag
commit needed to merge. still working on #1, anyway
fix merge conflict
fork update
Merge branch 'alfateam123-master'

Updated fork