index on master: 74c5318 updated oh my zsh
WIP on master: 74c5318 updated oh my zsh
Merge commit 'stash'

Conflicts:
	.oh-my-zsh/themes/failshell.zsh-theme