logs
Merge branch 'master' of https://github.com/Runnable/dockworker

Conflicts:
	dockworker.js