Merge pull request #1 from etmoore/master

Second line of Haiku and Lyrics
Merge pull request #1 from milesmatthias/master

Merge pull request #1 from etmoore/master