init
Merge branch 'master' of https://github.com/mattapperson/docker.io

Conflicts:
	.gitignore
	README.md