Merge pull request #1 from Tak0002/master

merge master
Merge branch 'develop'
marged
Merge branch 'develop'
Merge branch 'master' into gh-pages
Merge branch 'develop'
Merge branch 'master' into gh-pages
Merge branch 'develop'
Merge branch 'master' into gh-pages
fixed title
Merge branch 'gh-pages' into develop