sample.txtの追加
sample2の追加
yoの追加
Merge branch 'master' of https://github.com/imamura623/git_test

Conflicts:
	tete.txt