Externalize password
Merge branch 'master' of github.com:nhantran/docker-images

Conflicts:
	build