try merge
Signed-off-by: beer <beer@eatgo.com>
Merge branch 'master' of github.com:beer/shell

Conflicts:
	Makefile

Signed-off-by: beer <beer@eatgo.com>