branch 4
issue 5
まーじ
Merge branch 'master' of https://github.com/tsubasaxZZZ/gittest2

Conflicts:
	myfile.txt