did some work at work
Merge branch 'master' of https://github.com/dfedde/docker_workshop