comments #9 - testing some markdown convertion

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'markdown' into develop