This level appeared to function incorrectly; the hint seemed to imply that the merged file should
contain the 'correct' version of the poem and nothing else, but it required the phrase 'cool poem' be
in the file. Updated to refuse anything but the 'correct' poem.
Updated the conflict level to make more sense for the user.
Merge remote-tracking branch 'snoozbuster/master'

Conflicts:
	levels/conflict.rb