githubteacher/poetry — pull request #41 by hejens (2013-02-25 14:23:31+00:00)
Title: Added Carpe Diem

Should be no conflicts