*
Merge branch 'master' of github.com:dmitriiabramov/dotfiles

Conflicts:
	.zshrc