Adds easter egg
resolved merge conflict