ad hiki
Merge branch 'master' of https://github.com/sekaiya/study_git into addtashizan