commit kadai@3 java
Merge branch 'a-shingu'