Merge branch 'yanrui-test'

Accepting new text file, rejecting changes to lexicon