Merge pull request #1 from dockercn/develop

Init basic http proxy for docker
Merge branch 'master' of github.com:dockercn/docker-proxy
Merge pull request #2 from dockercn/master

Merge from develop