AA
Merge branch 'master' of https://github.com/jianqiaol/Project3-Pathtracer