second pull
Merge pull request #4 from durarumin/file_edit

File edit
Merge branch 'master' into modoru

Conflicts:
	new1.txt