http-master
Merge branch 'master' of github.com:DockerDemos/http-master