ignoring .netrwhist
Merge branch 'master' of https://github.com/gradunza5/dotfiles

Conflicts:
	vim/.netrwhist