競合が起きるコミット
Merge branch 'master' of https://github.com/linosatoh/gitbootcamp

Conflicts:
	file.txt