Update zshrc
Update sxhkdrc
Merge branch 'master' of github.com:medvid/dotfiles

Conflicts:
	zshrc