maj cpp.jj
Merge branch 'master' of github.com:IMAGOOL/GOOL
maj cpp.jj