required
Merge branch 'master' of github.com:chubakur/bolt-ConfigEditor

Conflicts:
	ConfigEditor/config.yml