16:43
Merge branch 'master' of https://github.com/sboxzhang/JXNG

Conflicts:
	wzt/wtz2.txt
	wzt/wzt.txt
Merge branch 'master' of https://github.com/sboxzhang/JXNG

Conflicts:
	wzt/wtz2.txt