first commit
Merge branch 'master' of github.com:nise-nabe/docker-mailcatcher

Conflicts:
	README.md