create branch
Merge remote-tracking branch 'TestGit/master' into bak

Conflicts:
	TestGit/TestGit.cpp
Merge remote-tracking branch 'TestGit/bak'
add function