no message
Merge branch 'master' of https://github.com/lanchester/gaienrb

# By kanekomasanori
# Via kanekomasanori
* 'master' of https://github.com/lanchester/gaienrb:
  20141022の課題を追加
  20141021のテーマを変更
no message
Merge branch 'master' into feature/20141021_iha

# By kanekomasanori
# Via iha (1) and kanekomasanori (1)
* master:
  20141022の課題を追加
  20141021のテーマを変更
Merge pull request #15 from lanchester/feature/20141021_iha

20141021_iha