commit on testBranch
will this work?
Merge branch 'master' of https://github.com/nakaneku/LearnGit

Conflicts:
	bin/TestHelloWorld.class
	src/TestHelloWorld.java