changed some
changed someMerge branch 'master' of github.com:yoneshin/dotfiles

Conflicts:
	.vimrc
	.zshrc