added wallpaper
Merge branch 'master' into jamesf

I fucked up.