oops
Merge remote-tracking branch 'upstream/master'
Added the ability to choose the preferred haiku and tanka authors
Missed the test method difference for tanka.
Merge pull request #31 from denete/master

Added the ability to choose the preferred haiku and tanka authors. +1000