Merge branch 'master' of https://github.com/amadanmath/dotfiles