追加　　@master　　masterに進捗あり
Merge branch 'master' into blanch

Conflicts:
	memo.txt