updates
Merge branch 'master' of github.com:ali01/dotfiles