modified:   vimrc
Merge branch 'master' of https://github.com/kuntau/dotfiles

Conflicts:
	vimrc

	modified:   vimrc
	modified:   zshrc