master branch add
3rd commit
不正な修正１
不正な修正２
Revert "不正な修正１"

This reverts commit 812c7c93b0abc16ae3108036fba668728bbec0a1.

Conflicts:
	sample_commit.txt
Revert "不正な修正２"

This reverts commit 38b5de3273c114e206ef1c94277aef1c31c00f8d.

Conflicts:
	sample_commit.txt
不要ファイルの削除
Merge branch 'test_branch'

Conflicts:
	sample_commit.txt