go
:wq
Merge branch 'master' of github.com:rutkovsky/dotfiles

Conflicts:
	dots/.vimrc
	dots/.zshrc