asfas
Merge branch 'master' of github.com:DotCi/docker_test

Conflicts:
	.ci.yml