generate wallpaper created
wallpaper with 1600x1200 resolution added
conflict
Merge branch 'master' of https://kelidas@github.com/kelidas/scratch.git

Conflicts:
	scratch/tests/name_from_ip.py