merge
Merge branch 'master' of github.com:hkust-psan1/FYP
added support for specular map
Merge pull request #22 from guanlun/master

specular map