changed shadow to gradient
removed asdf.png
fixed merge conflicts
Merge branch 'master' into gh-pages