srctree change
Merge branch 'master' of https://github.com/tetsuyasodo/helloworld

Conflicts:
	test5.txt

mine