Added a cool new thing
Merge branch 'master' of github.com:dfedde/docker_workshop