added logo to site
fixed merge, more styling