final version
Merge branch 'master' of https://github.com/br00ks/CG2