oops, fix code blocks in unordered lists
merge conflict from upstream
code indentation in first step
Merge pull request #2 from karlhorky/master

indentation in code blocks