Changed css and wallpaper
Merge remote-tracking branch 'origin/master'

Conflicts:
	img/bg.jpg
	index.html