v1.1 
add a function
v1.3 
try new patch
v1.4
main.c add function 2
Merge branch 'master' into branch1

Conflicts:
	git_test/Debug/git_test
	git_test/Debug/src/git_test.o
	git_test/src/git_test.c
v2.2
merge
v3.1
test reset