markdown from thomas

@imlucas 
including markdown from thomas