追加
Merge branch 'master' of https://github.com/MinakoInui/git

Conflicts:
	sample.txt.txt