#changed bg
Merge origin/gh-pages into gh-pages