Committing to change background
Resolving conflicts
Merge branch 'master' of https://github.com/gsubram4/chansey

Merging
Day/Night cycle