my stuffs
Merge branch 'master' of https://github.com/baude/docker-utils

Conflicts:
	docker-dash