commiting my ZSH config
commiting uncommited changes
Merge branch 'master' of github.com:failshell/dotfiles

Conflicts:
	.bashrc
	.vimrc