Merge remote-tracking branch 'remotes/origin/master' into HEAD

Conflicts:
	README.md
	譁ｰ隕上ユ繧ｭ繧ｹ繝・繝峨く繝･繝｡繝ｳ繝・txt