added logo and some color
fixed merge conflict