default change
Merge branch 'master' of https://github.com/thecuraga/groompbot

Conflicts:
	settings.json.default