backup
gitignore update
Merge branch 'master' of github.com:zimathon/dotfiles