Fixed the remnants of a conflict in a file committed by KB. Combined the two files with the two parts of Lamia into one, because KB has been linking to a single file that doesn't exist, and it's not horribly big. Added four new images to the gallery.