kk
Merge branch 'master' of https://github.com/Kill-The-Noise/Kill-The-Noise

Conflicts:
	config/config.js