special instructions around using emoji
Merge remote-tracking branch 'origin/master' into emoji
Merge pull request #8 from afeld/emoji

add special instructions around using emoji