add favicon, fix css
merge
add logo