renamed lexicon
Merge branch 'master' of https://github.com/ewan-klein/tradcon