From usr1
Merge branch 'master' of https://github.com/zwdtc/C_plusplus

Conflicts:
	git_test.c