get rid of nginx's dockerfile
Merge branch 'master' of https://github.com/rrott/docker
merged