modified:   kurisu/.vim/.netrwhist
	modified:   kurisu/.vimrc
Merge branch 'master' of https://github.com/undef--ed/dotfiles

Conflicts:
	kurisu/.vim/.netrwhist