added logo
fixed merge conflicts