add c++
Merge branch 'master' of github.com:abgood/known

Conflicts:
	vimrc