Pretty log
Merge branch 'master' of github.com:opilar/oh-my-zsh

Conflicts:
	plugins/git/git.plugin.zsh