Changed ENTRYPOINT to CMD in Dockerfile.
Merge branch 'master' of github.com:dockerfile/nginx