show ~ fixed
Merge branch 'master' of github.com:aliva/dotfiles