change log
Merge branch 'master' of github.com:whitebase/dotfiles