Tokio image changes when half dead
Merge branch 'master' of github.com:dtak1114/rubycamp2013

* 'master' of github.com:dtak1114/rubycamp2013:
  marge
  pants