+featureStudy1
Merge pull request #1 from UEDA-Shinsuke/feature/featureStudy1

[WIP]+featureStudy1
Merge branch 'feature/featureStudy1' into develop

Conflicts:
	test.txt
Merge remote-tracking branch 'origin/master' into develop