.
Merge branch 'master' of github.com:samuelchen/dockerfiles

Conflicts:
	README.md