FIX
FIX
Merge branch 'master' of github.com:akolosov/docker-mongodb

Conflicts:
	mongodb-startup.sh