changed shadow to gradient
removed asdf.png
fixed merge conflicts