Fixed merge issues -- now compiles. Added uncommentable Easter Egg, which I'm sure we'll delete before delivery.