no message
Merge branch 'master' into feature/iha

# By kanekomasanori (1) and omori.yasutaka (1)
# Via kanekomasanori (1) and lanches-kaneko (1)
* master:
  20141017のお題
  no message
Merge pull request #6 from lanchester/feature/iha

1015_iha