Created a Dockerfile to build a nginx image for testing.
Merge master