config
Merge branch 'master' of https://github.com/kgaddy/nidus-log

Conflicts:
	config.js
r