Merge pull request #32 from EdWarga/master

markup and a bit of cleanup
poetry encoding for 7/16/2014

Three poems via T. Hughes
cleaned up some weird line breaks
Encoding for Poems

Les Chats, La Pipe, La Musique.  Also added Les Hiboux
Revert "Encoding for Poems"

This reverts commit 7584b6c62400ee092c5d407c317a3e32d3cd0ea7.
Merge remote-tracking branch 'upstream/master'
Merge pull request #33 from Ramona2020/master

Updating
Encoding for Les Chats
Merge pull request #34 from Ramona2020/master

Encoding for Les Chats
Merge pull request #4 from CliffordAnderson/master

pulling in most recent changes