new branch
继续走otherTest分支
 (otherTest) does not update to the new master
master上出现了一个奇怪的分支，貌似是合并引起的本地分支
Merge branch 'master' of https://github.com/zknyy/agoncal-book-javaee7

Conflicts:
	testBranch02.txt
	testBranch03.txt