Change background, and update sass->css
Merge branches 'sass' and 'master'