Latest
Merge branch 'master' of https://github.com/ldconejo/pinYinTranslator

Conflicts:
	pyTranslator.db