margeテスト
Merge branch 'master' of https://github.com/takuyaarisawa/GitTest

Conflicts:
	Sample.txt