update
Merge branch 'master' of github.com:JackonYang/ubuntu_etc