second commit
Merge branch 'master' of https://github.com/tcwang0509/graphics-assignemnt-2