Merge pull request #1 from CliffordAnderson/master

Please let me pull the changes
Added Ed Warga as encoder
Merge branch 'pr/5'

Conflicts:
	fleurs-du-mal/fleurs-du-mal.xml