paritial branch1
branch one change 1
Merge branch 'branch1'

Conflicts:
	javagit/javagit/JavaGittest.java