Kiva-Entertainment/yohk — pull request #32 by KaiGeffen (2013-12-12 16:36:25+00:00)
Title: 2 bug markers overlap

Resolves #2
Content creation happened in this branch, despite it being unrelated to the branch's purpose.