all my work so far

Added my name in header and coding so far of Spleen et Ideal.
Resolved conflict with upstream
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Replaced XML file with Cliff's corrected version
Encoded lines and line groups for La Beaute
Merge branch 'pr/15'

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