競合テスト
Merge branch 'master' of https://github.com/Sig2t53/gitbootcamp

Conflicts:
	Readme.txt