試しに編集
Merge branch 'master' of https://github.com/ronpro2014s/our_first_repository

Conflicts:
	README.md