recent changes
Merge branch 'master' of github.com:v0lkan/node-scale

Conflicts:
	server/master/master.js
	server/worker/worker.js