3行目追加
Merge branch 'master' of https://github.com/blanket11/tutorial

Conflicts:
	sumple.txt