競合テスト
Merge branch 'test01' of github_ko-taro-02:ko-taro-/aki into test01

Conflicts:
	CircleTest/proguard-project.txt