unstable
Merge branch 'master' of github.com:BenNG/docker-mysql

Conflicts:
	Dockerfile