競合の実験
Merge branch 'master' of https://github.com/h-shino/gitbootcamp

Conflicts:
	readme.txt