Update OMZ
Update zsh
Merge branch 'master' of github.com:Mezzle/dotfiles
Merge branch 'master' into work
Update git config and add arduino
Merge branch 'master' into work

Conflicts:
	.ssh/config