123
Merge branch 'master' of https://github.com/MTime90/HuangZhiheng

Conflicts:
	menu4.c