updated
Merge branch 'master' of github.com:torkelo/influxdb-docker

Conflicts:
	Dockerfile