fixed poet/composer
Merge branch 'master' of https://github.com/bbloomf/lilypond-songs

Conflicts:
	Darby and Joan.ly