こんふてすとん
Merge branch 'master' of https://github.com/gac700/tutorial

Conflicts:
	saru.txt
コンフリクト修正