Update local thinkpad t420

	modified:   .netrwhist
	modified:   snippets/cpp.snippets
Merge branch 'master' of github.com:rkadeFR/dotvim

Conflicts:
	.netrwhist
	snippets/cpp.snippets