fixing shit
Merge branch 'master' of https://github.com/paulczar/docker-registry-glance

Conflicts:
	Dockerfile