init
updated images/css
fixed merge