Ignore config backup.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Resolve .gitignore conflict.