adding docker files
Merge branch 'master' of github.com:schleg/docker-test

Conflicts:
	Dockerfile