Updating files
Merge branch 'master' of https://github.com/dst-/dotfiles

Conflicts:
	.zshrc