modified:   config.sample.js
Merge branch 'master' of https://github.com/kasuparu/sincemonday

Conflicts:
	config.sample.js