branch#2
Merge branch 'branch1'

Conflicts:
	javagit/javagit/JavaGittest.java
change from umsu2
change from umsu2
change from umsu2b
Merge branch 'master' of https://github.com/umsu2/javagit.git

Conflicts:
	javagit/javagit/JavaGittest.java
sfdf
dsfsdf
fgdfg
dsff
Revert "dsff"

This reverts commit b1c01b7cbbcdc7c1a47635e3653d54c6131799b3.
dsfsdf
fsdfdsf
efgdgfg
Merge branch 'master' into version3

Conflicts:
	javagit/javagit/JavaGittest.java
sff
aaa
dsdsd
sdfsdf
sdfsdf