adaptations for C++11 with clang / more correct code
Merge branch 'master' of github.com:PeterSommerlad/Prog3