修改若干bug
Merge branch 'master' of github.com:jacksongblack/linux_shell

提交