第七
Merge branch 'master' of https://github.com/itair/Try0106

Conflicts:
	GobalFuc.cpp
	GobalFuc.h
	Main.cpp