test7
Merge remote-tracking branch 'origin/master'

Conflicts:
	gittest/src/test/java/com/chinasofit/git/Test.java