Merge pull request #1 from CliffordAnderson/master

update my master
Updated Sed Non Satiata
Merge branch 'cpb-encodingbranch'
Merge pull request #41 from chrisbenda/master

Added Sed Non Satiata
Merge pull request #42 from EdWarga/master

Markup for Todd's poems
Merge pull request #8 from CliffordAnderson/master

update!