Added easter egg
fixed merge conflicts