More logical braces and brackets
Merge branch 'master' of github:baabelfish/dotfiles
asd
Merge branch 'master' of github:baabelfish/dotfiles

Conflicts:
	.zsh/alias.sh