競合テスト2
Merge branch 'master' of https://github.com/hogedigo/knightso-sandbox

Conflicts:
	generator-mock/README.md