Merge branch 'master' of github.com:shohoku11wrj/shohoku11wrj.github.com
Merge branch 'master' of github.com:shohoku11wrj/shohoku11wrj.github.com