changed background-color
changed background-color
Merge branch 'master' into gh-pages

* master:
  changed background-color

Conflicts:
	css/main.css
	css/scss/_global.scss