removed some css
psd
Fix merge conflict.
edited html, added second psd
Fix merge conflict.