docker
Merge branch 'master' of https://github.com/ipetty/i-shell

Conflicts:
	ilib