Merge vimrc file
Merge branch 'master' of github.com:ts310/dotfiles

Conflicts:
	vimrc
Update oh-my-zsh