fixed status
Merge branch 'master' of github.com:wxl/dotfiles