marge
Merge branch 'master' of github.com:lpcwww/dotfiles

Conflicts:
	.zshrc
Merge branch 'master' of github.com:lpcwww/dotfiles
modi vimrc