first commit changed after cloning
Merge branch 'master' of ssh://git@github.com/a6955567/testproj

Conflicts:
	javaprojects/src/Hello.java