no message
Merge branch 'master' of https://github.com/cqw25116/NOVEL

Conflicts:
	nnd_sub.bat