- Adding .gitignore and removing .vim/.netrwhist
Merge branch 'master' of github.com:/zooy0rk/dotfiles

Conflicts:
	.vim/.netrwhist