Update.
Merge branch 'master' of github.com:laynor/oh-my-zsh-custom

Conflicts:
	shared/lua.zsh