conflict?
Merge branch 'master' of https://github.com/SikuliScriptForWuXiaQChuan/AutoCreatingForThreeJia

Conflicts:
	legendQLib.sikuli/legendQLib.html
	legendQLib.sikuli/legendQLib.py