added git ignore
Merge branch 'master' of https://github.com/jonyardley/docker-demo

Signed-off-by: Jon Yardley <Jon.Yardley@digitaslbi.com>

Conflicts:
	.idea/workspace.xml