functions.phpのマージ
Merge branch 'master' of git@github.com:pacsolution/nanjorno.git