競合を起こすコミット
Merge branch 'master' of https://github.com/linosatoh/gitbootcamp

Conflicts:
	README.md