edit　is no good.
Merge branch 'master' into modoru

Conflicts:
	new1.txt
Merge pull request #5 from durarumin/modoru

nice!!