Updating
Merge branch 'master' of https://github.com/dangirsh/dotfiles

Conflicts:
	.emacs
	.zshrc