fix
Merge branch 'master' of https://github.com/tkcfjips/MyFirstRepository

Conflicts:
	コンフリクトの練習.txt