追加修正したお
Merge branch 'master' of https://github.com/imamura623/git_test

Conflicts:
	tete.txt
Merge pull request #1 from imamura443/master

追加修正したおをとりこむお