commit
Merge branch 'master' of https://github.com/jianhangzhang/docker-sinboUI

Conflicts:
	README.md