commit
Merge branch 'master' into gitwork

Conflicts:
	file - コピー.txt