using ours
Merge branch 'master' of https://github.com/urban/docker-etherpad

Conflicts:
	README.md