reset
Merge branch 'master' of github.com:wknar/dotfiles