ZZZ
Merge branch 'master' of https://github.com/tokujokarubi/test

Conflicts:
	hello7.txt