Dockerfile and configuration files
Merge branch 'master' of github.com:tscolari/docker-nginx

* 'master' of github.com:tscolari/docker-nginx:
  Initial commit

Conflicts:
	README.md