Add support for marked markdown parser

the dependency was added according to the instructions in gh-385
Conflicts:
	package.json
fix merge conflict
remove github-flavored-markdown; automatically use marked instead (#385)