merge phong
Merge branch 'master' of https://github.com/RomainBrault/Advanced-Graphics