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

Conflicts:
	javagit/javagit/JavaGittest.java