change file
reset file
修改文字
增加字符
Merge branch 'anothertest'

Conflicts:
	src/gittest/HelloWorld.java