manual merge
Merge branch 'master' of github.com:tenshiPure/dotfiles