おおおおおお
Merge branch 'master' of github.com:dksonoda/test

Conflicts:
	copy.txt