at hotfix branch fix a bug,modify test.java and add hotfix.java
test.java add one line
hotfix add one
master commit
hotfix commit
Merge branch 'hotfix'

Conflicts:
	src/hotfix.java