modified:   config.js
Merge branch 'master' of https://github.com/atarss/chisakiPlayer

Conflicts:
	node/config.js
modified:   config.js