escape html
fixed merge conflict

Merge branch 'master' of https://github.com/SwedishPensionsAgency/diffr

Conflicts:
	R/show-diff.R