test
Merge branch 'develop' of https://github.com/studentaiueo/foursection into kaneko_branch2
kaneko_test
test
test
Merge branch 'develop' of https://github.com/studentaiueo/foursection into develop

Conflicts:
	readme.txt