local changes
Merge branch 'master' of https://github.com/arieee/dotfiles

Conflicts:
	.gitconfig
modify
Merge branch 'master' of https://github.com/arieee/dotfiles

Conflicts:
	.bashrc
local path
Merge branch 'master' of https://github.com/arieee/dotfiles

Conflicts:
	.bashrc
remove backup files
add brewList