no message
Merge branch 'master' into feature/20141023_iha

# By iha (1) and others
# Via lanches-kaneko (2) and kanekomasanori (1)
* master:
  20141024の課題をついか
  no message
  no message
Merge pull request #19 from lanchester/feature/20141023_iha

20141023_iha