Add changes from previous branch
Merge branch 'change-background'

* change-background:
  Add changes from previous branch