new file:   i3/config
	new file:   i3/i3status.conf
	new file:   mklinks.sh
	modified:   zsh/zshrc
Merge branch 'master' of https://github.com/spillevink/dotfiles