tunning
Merge branch 'master' of github.com:cironunes/dotfiles

Conflicts:
	.zshrc