[TASK] Added oh-my-zsh
Merge branch 'master' into feature/ohmyzsh

Conflicts:
	Cheffile
	site-cookbooks/typo3-flow/metadata.rb
	site-cookbooks/typo3-flow/recipes/default.rb
Merge pull request #15 from avency/feature/ohmyzsh

[TASK] Added oh-my-zsh