Merge branch 'kita'
fixed
addition of hayashi
fixed2
Merge branch 'master' of github.com:ychubachi/third_enpit
Merge pull request #14 from ychubachi/master

kita