initial commit
support for <em> and * markers for emphasis
Merge remote-tracking branch 'origin/master'