small changes
Merge branch 'master' of https://github.com/jaccokrijnen/markup

Conflicts:
	markdown_grammar.md
	markupconverter/src/Test.hs
Functioning html semantics for headers, paragraphs and basic inline fragments