test
Somethings!!
branchテスト
テストテキスト更新
hiranoのbranch
Merge branch 'develop' into nuttapon_branch

Conflicts:
	nuttapon_test.txt

conflict resolved
Merge branch 'develop' of https://github.com/studentaiueo/foursection into sakuma_develop
sakuma0514
Merge branch 'develop' of https://github.com/studentaiueo/foursection into kaneko_branch2
kaneko_test
test
sakuma0514-2
test
Merge branch 'develop' of https://github.com/studentaiueo/foursection into develop

Conflicts:
	readme.txt
Merge branch 'develop' into hirano_branch
readme.txt変更
miyamoto add
五島テストー
文字コードが変わってる件
E!U!C! E!U!C!