Initial commit
test
Merge branch 'master' of github.com:slont/dotfiles

Conflicts:
	.zsh.d