再一次的更改
Merge branch 'master' of https://github.com/zoharwolf/MorenatsuTextGuider

Conflicts:
	help.txt