merge m-kishi branch with @3
Merge branch 'master' of https://github.com/shuntaro4/studygroup
commit kadai@3 java
Merge branch 'a-shingu'