色々と修正
Merge branch 'master' of https://github.com/SHUNDAN/hjc2014_sesami