further work on c++
Merge branch 'master' of https://github.com/silenceH/fragments
merged from work at home.