properties
gitignore merge
Merge branch 'master' of https://github.com/yeren/background

Conflicts:
	.gitignore