test
test
Merge branch 'master' of https://github.com/stuartneivandt/dotfiles

Conflicts:
	.bashrc
	.vim/.netrwhist