conflicting version
Merge branch 'master' of https://github.com/swwl1992/STM-Dict-Gen
complete message and more setup instructions