игнорировать *.bak
Merge branch 'master' of github.com:dmitriy5181/dotfiles

Conflicts:
	.gitignore